From 94bf739cea9ebace9338a41abff9fcb4dde0b628 Mon Sep 17 00:00:00 2001 From: fca Date: Wed, 22 Oct 2008 10:45:11 +0000 Subject: [PATCH] Removing gcc 4.3 warnings --- MUON/AliMUONClusterFinderMLEM.cxx | 2 +- MUON/AliMUONClusterSplitterMLEM.cxx | 14 ++++++------- MUON/AliMUONConstants.h | 16 +++++++-------- MUON/AliMUONDEPainter.cxx | 4 ++-- MUON/AliMUONGlobalCrateConfig.h | 6 +++--- MUON/AliMUONPainterContourMaker.cxx | 2 +- MUON/AliMUONPreClusterFinderV2.cxx | 4 ++-- MUON/AliMUONQAChecker.cxx | 8 ++++---- MUON/AliMUONQAChecker.h | 8 ++++---- MUON/AliMUONSurveyObj.cxx | 6 +++--- MUON/mapping/AliMpDEManager.cxx | 12 +++++------ MUON/mapping/AliMpLocalBoard.cxx | 2 +- MUON/mapping/AliMpSector.cxx | 16 +++++++-------- RAW/AliAltroBunch.h | 8 ++++---- TPC/AliTPCAltroEmulator.cxx | 2 +- TPC/AliTPCCalPadRegion.cxx | 2 +- TPC/AliTPCCalibViewer.cxx | 6 +++--- TPC/AliTPCDigitizer.cxx | 4 ++-- TPC/AliTPCLaserTracks.cxx | 2 +- TPC/AliTPCPid.cxx | 32 ++++++++++++++--------------- TPC/AliTPCclustererKr.cxx | 2 +- TPC/AliTPCclustererMI.cxx | 4 ++-- TPC/AliTPCtrackerMI.cxx | 6 +++--- ZDC/AliGenZDC.h | 4 ++-- 24 files changed, 86 insertions(+), 86 deletions(-) diff --git a/MUON/AliMUONClusterFinderMLEM.cxx b/MUON/AliMUONClusterFinderMLEM.cxx index ff5c40ff2da..d72c2b69b27 100644 --- a/MUON/AliMUONClusterFinderMLEM.cxx +++ b/MUON/AliMUONClusterFinderMLEM.cxx @@ -957,7 +957,7 @@ Bool_t AliMUONClusterFinderMLEM::MainLoop(AliMUONCluster& cluster, Int_t iSimple AliMUONPad* pixPtr2 = Pixel(ipix); if ( nPix >= npadOK // too many pixels already || - pixPtr2->Charge() < pixMin && pixPtr2->Status() != fgkMustKeep // too low charge + ((pixPtr2->Charge() < pixMin) && (pixPtr2->Status() != fgkMustKeep)) // too low charge ) { RemovePixel(ipix); diff --git a/MUON/AliMUONClusterSplitterMLEM.cxx b/MUON/AliMUONClusterSplitterMLEM.cxx index bb92014ccd0..da1f0ff6bdc 100644 --- a/MUON/AliMUONClusterSplitterMLEM.cxx +++ b/MUON/AliMUONClusterSplitterMLEM.cxx @@ -352,7 +352,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster, Int_t nfitMax = 3; nfitMax = TMath::Min (nfitMax, (npads + 1) / 3); if (nfitMax > 1) { - if (nInX < 3 && nInY < 3 || nInX == 3 && nInY < 3 || nInX < 3 && nInY == 3) nfitMax = 1; // not enough pads in each direction + if (((nInX < 3) && (nInY < 3)) || ((nInX == 3) && (nInY < 3)) || ((nInX < 3) && (nInY == 3))) nfitMax = 1; // not enough pads in each direction } if (nfit > nfitMax) nfit = nfitMax; @@ -511,8 +511,8 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster, { shift[j] = 0; } - else if (deriv[min][j]*deriv[!min][j] > 0 && TMath::Abs(deriv[min][j]) > TMath::Abs(deriv[!min][j]) - || TMath::Abs(deriv[0][j]-deriv[1][j]) < 1.e-3 || TMath::Abs(dder[j]) < 1.e-6) + else if (((deriv[min][j]*deriv[!min][j] > 0) && (TMath::Abs(deriv[min][j]) > TMath::Abs(deriv[!min][j]))) + || (TMath::Abs(deriv[0][j]-deriv[1][j]) < 1.e-3) || (TMath::Abs(dder[j]) < 1.e-6)) { shift[j] = -TMath::Sign (shift[j], (func2[0]-func2[1]) * (param0[0][j]-param0[1][j])); if (min == max) @@ -591,7 +591,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster, } } // for (Int_t j=0; j 150) break; // minimum was found + if (((estim < 1) && (derMax < 2)) || nLoop > 150) break; // minimum was found nLoop++; @@ -631,8 +631,8 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster, //if (fNpar > 2) cout << param0[min][fNpar-3] << " " << chi2n * (1+TMath::Min(1-param0[min][fNpar-3],0.25)) << endl; //if (chi2n*1.2+1.e-6 > chi2o ) - if (fNpar > 2 && (chi2n > chi2o || iseed == nfit-1 - && chi2n * (1+TMath::Min(1-param0[min][fNpar-3],0.25)) > chi2o)) + if (fNpar > 2 && (chi2n > chi2o || ((iseed == nfit-1) + && (chi2n * (1+TMath::Min(1-param0[min][fNpar-3],0.25)) > chi2o)))) { fNpar -= 3; break; } // Save parameters and errors @@ -691,7 +691,7 @@ AliMUONClusterSplitterMLEM::Fit(const AliMUONCluster& cluster, if (fDebug) { for (Int_t i=0; i(next())) && pad->IsUsed() ); + while ( ( pad = static_cast(next())) && pad->IsUsed() ) {} if (!pad) // protection against no pad in first cathode, which might happen { // try other cathode TIter next2(fPads[1]); - while ( ( pad = static_cast(next2())) && pad->IsUsed() ); + while ( ( pad = static_cast(next2())) && pad->IsUsed() ) {} if (!pad) { // we are done. diff --git a/MUON/AliMUONQAChecker.cxx b/MUON/AliMUONQAChecker.cxx index 6f90733b7c2..eab1210d173 100644 --- a/MUON/AliMUONQAChecker.cxx +++ b/MUON/AliMUONQAChecker.cxx @@ -110,7 +110,7 @@ AliMUONQAChecker::GetHisto(TObjArray* list, const char* hname) const } //______________________________________________________________________________ -const Double_t +Double_t AliMUONQAChecker::CheckRecPoints(TObjArray * list) { /// Check rec points @@ -126,7 +126,7 @@ AliMUONQAChecker::CheckRecPoints(TObjArray * list) } //______________________________________________________________________________ -const Double_t +Double_t AliMUONQAChecker::MarkHisto(TH1& histo, Double_t value) const { /// Mark histo as originator of some QA error/warning @@ -140,7 +140,7 @@ AliMUONQAChecker::MarkHisto(TH1& histo, Double_t value) const } //______________________________________________________________________________ -const Double_t +Double_t AliMUONQAChecker::CheckESD(TObjArray * list) { /// Check ESD @@ -161,7 +161,7 @@ AliMUONQAChecker::CheckESD(TObjArray * list) } //______________________________________________________________________________ -const Double_t +Double_t AliMUONQAChecker::CheckRaws(TObjArray * list) { /// Check raws diff --git a/MUON/AliMUONQAChecker.h b/MUON/AliMUONQAChecker.h index aaf6115f07d..95dfe2a2313 100644 --- a/MUON/AliMUONQAChecker.h +++ b/MUON/AliMUONQAChecker.h @@ -32,11 +32,11 @@ protected: virtual Double_t Check(AliQA::ALITASK_t index, TObjArray * list) ; virtual void SetQA(AliQA::ALITASK_t index, const Double_t value) const ; - const Double_t CheckRaws(TObjArray* list); - const Double_t CheckRecPoints(TObjArray* list); - const Double_t CheckESD(TObjArray* list); + Double_t CheckRaws(TObjArray* list); + Double_t CheckRecPoints(TObjArray* list); + Double_t CheckESD(TObjArray* list); TH1* GetHisto(TObjArray* list, const char* hname) const; - const Double_t MarkHisto(TH1& histo, Double_t value) const; + Double_t MarkHisto(TH1& histo, Double_t value) const; private: diff --git a/MUON/AliMUONSurveyObj.cxx b/MUON/AliMUONSurveyObj.cxx index 33208a2548b..b6832ecf466 100644 --- a/MUON/AliMUONSurveyObj.cxx +++ b/MUON/AliMUONSurveyObj.cxx @@ -435,9 +435,9 @@ void SurveyFcn(int &npar, double *g, double &f, double *par, int iflag) { AliMUONSurveyObj *aSurveyObj = (AliMUONSurveyObj*) gMinuit->GetObjectFit(); f = aSurveyObj->SurveyChi2(par); - if (iflag==3); - if (npar); - if (g); // no warnings about unused stuff... + if (iflag==3) {} + if (npar) {} + if (g) {} // no warnings about unused stuff... } diff --git a/MUON/mapping/AliMpDEManager.cxx b/MUON/mapping/AliMpDEManager.cxx index 059495396d1..de6871c0cb7 100644 --- a/MUON/mapping/AliMpDEManager.cxx +++ b/MUON/mapping/AliMpDEManager.cxx @@ -154,12 +154,12 @@ Int_t AliMpDEManager::GetGeomModuleId(Int_t detElemId, Bool_t warn) if ( ! IsValidDetElemId(detElemId, warn) ) return -1; return detElemId/fgkCoefficient - + (detElemId >= 505 && detElemId <= 513 || detElemId >= 600 ) - + (detElemId >= 605 && detElemId <= 613 || detElemId >= 700 ) - + (detElemId >= 707 && detElemId <= 719 || detElemId >= 800 ) - + (detElemId >= 807 && detElemId <= 819 || detElemId >= 900 ) - + (detElemId >= 907 && detElemId <= 919 || detElemId >= 1000 ) - + (detElemId >= 1007 && detElemId <= 1019 || detElemId >= 1100 ) - 1; + + ((detElemId >= 505 && detElemId <= 513) || detElemId >= 600 ) + + ((detElemId >= 605 && detElemId <= 613) || detElemId >= 700 ) + + ((detElemId >= 707 && detElemId <= 719) || detElemId >= 800 ) + + ((detElemId >= 807 && detElemId <= 819) || detElemId >= 900 ) + + ((detElemId >= 907 && detElemId <= 919) || detElemId >= 1000 ) + + ((detElemId >= 1007 && detElemId <= 1019) || detElemId >= 1100 ) - 1; } //______________________________________________________________________________ diff --git a/MUON/mapping/AliMpLocalBoard.cxx b/MUON/mapping/AliMpLocalBoard.cxx index eed7177e3cc..c3efaa88756 100644 --- a/MUON/mapping/AliMpLocalBoard.cxx +++ b/MUON/mapping/AliMpLocalBoard.cxx @@ -173,7 +173,7 @@ Int_t AliMpLocalBoard::GetSwitch(Int_t index) const AliWarning("Switch index too large"); return -1; } - return (fSwitch >> 9-index) & 0x1; + return (fSwitch >> (9-index)) & 0x1; } //______________________________________________________________________________ diff --git a/MUON/mapping/AliMpSector.cxx b/MUON/mapping/AliMpSector.cxx index 38eb2997adb..ecd64ae5e96 100755 --- a/MUON/mapping/AliMpSector.cxx +++ b/MUON/mapping/AliMpSector.cxx @@ -190,17 +190,17 @@ void AliMpSector::SetMinMaxPadDimensions() for (Int_t i=1; iGetPadDimensions(); - if ( fDirection == AliMp::kX && - padDimensions.Y() > 0. && padDimensions.Y() < fMinPadDimensions.Y() || - fDirection == AliMp::kY && - padDimensions.X() > 0. && padDimensions.X() < fMinPadDimensions.X()) + if ( (fDirection == AliMp::kX && + padDimensions.Y() > 0. && padDimensions.Y() < fMinPadDimensions.Y()) || + (fDirection == AliMp::kY && + padDimensions.X() > 0. && padDimensions.X() < fMinPadDimensions.X())) fMinPadDimensions = padDimensions; - if ( fDirection == AliMp::kX && - padDimensions.Y() > 0. && padDimensions.Y() > fMaxPadDimensions.Y() || - fDirection == AliMp::kY && - padDimensions.X() > 0. && padDimensions.X() > fMinPadDimensions.X()) + if ( (fDirection == AliMp::kX && + padDimensions.Y() > 0. && padDimensions.Y() > fMaxPadDimensions.Y()) || + (fDirection == AliMp::kY && + padDimensions.X() > 0. && padDimensions.X() > fMinPadDimensions.X())) fMaxPadDimensions = padDimensions; } diff --git a/RAW/AliAltroBunch.h b/RAW/AliAltroBunch.h index 5ca9c8aec6d..91e4373b876 100644 --- a/RAW/AliAltroBunch.h +++ b/RAW/AliAltroBunch.h @@ -27,7 +27,7 @@ public: inline int CheckConsistency() { - if( (fPrevEndTimeBin - fPrewBunchSize ) <= fEndTimeBin ) + if(static_cast(fPrevEndTimeBin) <= (fEndTimeBin+fPrewBunchSize)) { // printf("%s:%d, ERROR conistency check failed\n", __FILE__ , __LINE__ ); return DECODERERROR; @@ -38,10 +38,10 @@ public: } } - inline UInt_t GetEndTimeBin() const { return fEndTimeBin; } + UInt_t GetEndTimeBin() const { return fEndTimeBin; } inline void SetEndTimeBin(UInt_t bin) {fPrevEndTimeBin = fEndTimeBin; fEndTimeBin = bin; } - inline UInt_t GetStartTimeBin() const { return (fEndTimeBin - (fBunchSize -1)); } - inline void SetStartTimeBin(UInt_t bin) { fStartTimeBin = bin; } + UInt_t GetStartTimeBin() const { return (fEndTimeBin - (fBunchSize -1)); } + void SetStartTimeBin(UInt_t bin) { fStartTimeBin = bin; } private: AliAltroBunch& operator = (const AliAltroBunch& bunch); diff --git a/TPC/AliTPCAltroEmulator.cxx b/TPC/AliTPCAltroEmulator.cxx index 7b920304bba..9fd2448eec7 100644 --- a/TPC/AliTPCAltroEmulator.cxx +++ b/TPC/AliTPCAltroEmulator.cxx @@ -221,7 +221,7 @@ void AliTPCAltroEmulator::ConfigAltro(int ONBaselineCorrection1, int ONTailcance fOnBSL2 = InRange(ONBaselineCorrection2,0,1,"AliTPCAltroEmulator::ConfigAltro","ONBaselineCorrection2"); fOnClip = InRange(ONClipping,0,1,"AliTPCAltroEmulator::ConfigAltro","ONClipping"); fOnZSU = InRange(ONZerosuppression,0,1,"AliTPCAltroEmulator::ConfigAltro","ONZerosuppression"); - ONDataFormatting; // does not have to be checked + // ONDataFormatting; // does not have to be checked fConfiguredAltro = 1; } diff --git a/TPC/AliTPCCalPadRegion.cxx b/TPC/AliTPCCalPadRegion.cxx index 7cd5601d892..4b6b22d178c 100644 --- a/TPC/AliTPCCalPadRegion.cxx +++ b/TPC/AliTPCCalPadRegion.cxx @@ -89,7 +89,7 @@ void AliTPCCalPadRegion::SetObject(TObject* obj, UInt_t segment, UInt_t pa // Set the object for given segment // if (BoundsOk("SetObject", segment, padType)){ - if (segment+fgkNSegments*padType>fObjects->GetEntriesFast()) fObjects->Expand(fgkNSegments * fgkNPadTypes); + if (segment+fgkNSegments*padType>static_cast(fObjects->GetEntriesFast())) fObjects->Expand(fgkNSegments * fgkNPadTypes); fObjects->AddAt(obj, segment+fgkNSegments*padType); } } diff --git a/TPC/AliTPCCalibViewer.cxx b/TPC/AliTPCCalibViewer.cxx index d6c2279a499..b44c630ffab 100644 --- a/TPC/AliTPCCalibViewer.cxx +++ b/TPC/AliTPCCalibViewer.cxx @@ -795,7 +795,7 @@ Int_t AliTPCCalibViewer::SigmaCut(const char* drawCommand, const char* sector, c cutHistoLTM->SetLineColor(kGreen+2); legend->AddEntry(cutHistoLTM, "LTM", "l"); cutHistoLTM->SetTitle(Form("%s, cumulative; Multiples of #sigma; Fraction of included data", htemp->GetTitle())); - if (plotMean && cutHistoMean || plotMedian && cutHistoMedian) cutHistoLTM->Draw("same"); + if ((plotMean && cutHistoMean) || (plotMedian && cutHistoMedian)) cutHistoLTM->Draw("same"); else cutHistoLTM->Draw(); DrawLines(cutHistoLTM, nsigma, legend, kGreen+2, pm); } @@ -996,7 +996,7 @@ Int_t AliTPCCalibViewer::IntegrateOld(const char* drawCommand, const char* secto integralHistoLTM->SetLineColor(kGreen+2); legend->AddEntry(integralHistoLTM, "LTM", "l"); integralHistoLTM->SetTitle(Form("%s, integrated; Multiples of #sigma; Fraction of included data", htemp->GetTitle())); - if (plotMean && integralHistoMean || plotMedian && integralHistoMedian) integralHistoLTM->Draw("same"); + if ((plotMean && integralHistoMean) || (plotMedian && integralHistoMedian)) integralHistoLTM->Draw("same"); else integralHistoLTM->Draw(); DrawLines(integralHistoLTM, nsigma, legend, kGreen+2, kTRUE); } @@ -1104,7 +1104,7 @@ Int_t AliTPCCalibViewer::Integrate(const char* drawCommand, const char* sector, integralGraphLTM->SetLineColor(kGreen+2); legend->AddEntry(integralGraphLTM, "LTM", "l"); integralGraphLTM->SetTitle(Form("%s, integrated; Multiples of #sigma; Fraction of included data", htemp->GetTitle())); - if (plotMean && integralGraphMean || plotMedian && integralGraphMedian) integralGraphLTM->Draw("samelu"); + if ((plotMean && integralGraphMean) || (plotMedian && integralGraphMedian)) integralGraphLTM->Draw("samelu"); else integralGraphLTM->Draw("alu"); DrawLines(integralGraphLTM, nsigma, legend, kGreen+2, kTRUE); } diff --git a/TPC/AliTPCDigitizer.cxx b/TPC/AliTPCDigitizer.cxx index b5aada7be3d..7f1c162225b 100644 --- a/TPC/AliTPCDigitizer.cxx +++ b/TPC/AliTPCDigitizer.cxx @@ -106,7 +106,7 @@ void AliTPCDigitizer::ExecFast(Option_t* option) char s[100]; char ss[100]; TString optionString = option; - if (optionString.Data() == "deb") { + if (!strcmp(optionString.Data(),"deb")) { cout<<"AliTPCDigitizer::Exec: called with option deb "<0 && n2>0 ) + if ( (n1>0) && (n2>0) ) if ( (vF-vI1).Mag() <= (vF-vI2).Mag() ) return (vF-vI1).Mag(); else diff --git a/TPC/AliTPCPid.cxx b/TPC/AliTPCPid.cxx index 27e2c3017d3..1b177ae53ea 100644 --- a/TPC/AliTPCPid.cxx +++ b/TPC/AliTPCPid.cxx @@ -268,45 +268,45 @@ Int_t AliTPCPid::GetPcode(Float_t q,Float_t pm) { if( qEval(pm) ){fWpi=1.; return Pion(); } else {fWk =1.; return Kaon();} } //3)----------------------200-400 Mev/c ------------- - if ( pm<=fcut[3][0] ) + if ( pm<=fcut[3][0] ){ if( qEval(pm) ) { fWpi=1.;return Pion(); } else { if ( q<=fCutPr->Eval(pm) ) {fWk=1.;return Kaon();} else {fWp=1.;return Proton();} - } + }} //4)----------------------400-450 Mev/c ------------- - if ( pm<=fcut[4][0] ) + if ( pm<=fcut[4][0] ){ if( qEval(pm) ) { fWpi=1.;return Pion(); } else { if( qEval(pm) ) {fWk=1.;return Kaon();} else {fWp=1.;return Proton(); } - } + }} //5)----------------------450-500 Mev/c ------------- - if ( pm<=fcut[5][0] ) + if ( pm<=fcut[5][0] ){ if ( q>fCutPr->Eval(pm) ) - {fWp=1.;return Proton();} else {return Wpik(5,q);}; + {fWp=1.;return Proton();} else {return Wpik(5,q);}} //6)----------------------500-550 Mev/c ------------- - if ( pm<=fcut[6][0] ) + if ( pm<=fcut[6][0] ){ if ( q>fCutPr->Eval(pm) ) - {fWp=1.;return Proton();} else {return Wpik(6,q);}; + {fWp=1.;return Proton();} else {return Wpik(6,q);}} //7)----------------------550-600 Mev/c ------------- - if ( pm<=fcut[7][0] ) + if ( pm<=fcut[7][0] ){ if ( q>fCutPr->Eval(pm) ) - {fWp=1.;return Proton();} else {return Wpik(7,q);}; + {fWp=1.;return Proton();} else {return Wpik(7,q);}} //8)----------------------600-650 Mev/c ------------- - if ( pm<=fcut[8][0] ) - if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();} + if ( pm<=fcut[8][0] ){ + if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();}} else {return Wpik(8,q);}; //9)----------------------650-730 Mev/c ------------- - if ( pm<=fcut[9][0] ) + if ( pm<=fcut[9][0] ){ if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();} - else {return Wpik(9,q);}; + else {return Wpik(9,q);}} //10)----------------------730-830 Mev/c ------------- - if( pm<=fcut[10][0] ) - if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();} + if( pm<=fcut[10][0] ){ + if ( q>fCutPrTune*fCutPr->Eval(pm) ){fWp=1.;return Proton();}} else {return Wpik(10,q);}; //11)----------------------830-930 Mev/c ------------- if( pm<=fcut[11][0] ){ return Wpikp(11,q); } diff --git a/TPC/AliTPCclustererKr.cxx b/TPC/AliTPCclustererKr.cxx index d4e6eb0b9fb..bc5e8bf5dab 100644 --- a/TPC/AliTPCclustererKr.cxx +++ b/TPC/AliTPCclustererKr.cxx @@ -634,7 +634,7 @@ Int_t AliTPCclustererKr::FindClusterKrIO() for(Int_t iTimeBin=1;iTimeBinGetDoUnfold())) { + if ( ((ry <1.2) && (rz<1.2)) || (!fRecoParam->GetDoUnfold())) { // //if cluster looks like expected or Unfolding not switched on //standard COG is used @@ -445,7 +445,7 @@ void AliTPCclustererMI::UnfoldCluster(Float_t * matrix2[7], Float_t recmatrix[5] else{ Float_t ratio =1; if ( ( ((sum3i[dk+3]+3)/(sum3i[3]-3))+1 < (sum3i[2*dk+3]-3)/(sum3i[dk+3]+3))|| - sum3i[dk+3]<=sum3i[2*dk+3] && sum3i[dk+3]>2 ){ + (sum3i[dk+3]<=sum3i[2*dk+3] && sum3i[dk+3]>2 )){ Float_t xm2 = sum3i[-dk+3]; Float_t xm1 = sum3i[+3]; Float_t x1 = sum3i[2*dk+3]; diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx index a5778f87bac..ad8df463138 100644 --- a/TPC/AliTPCtrackerMI.cxx +++ b/TPC/AliTPCtrackerMI.cxx @@ -5273,13 +5273,13 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) kink->SetTPCRow0(GetRowNumber(kink->GetR())); Int_t index0 = kink->GetIndex(0); Int_t index1 = kink->GetIndex(1); - if (circular[index0]||circular[index1]&&kink->GetDistance()>0.2) continue; + if (circular[index0]||(circular[index1]&&kink->GetDistance()>0.2)) continue; kink->SetMultiple(usage[index0],0); kink->SetMultiple(usage[index1],1); if (kink->GetMultiple()[0]+kink->GetMultiple()[1]>2) continue; if (kink->GetMultiple()[0]+kink->GetMultiple()[1]>0 && quality[indexes[i]]>0.2) continue; if (kink->GetMultiple()[0]+kink->GetMultiple()[1]>0 && kink->GetDistance()>0.2) continue; - if (circular[index0]||circular[index1]&&kink->GetDistance()>0.1) continue; + if (circular[index0]||(circular[index1]&&kink->GetDistance()>0.1)) continue; AliTPCseed * ktrack0 = (AliTPCseed*)array->At(index0); AliTPCseed * ktrack1 = (AliTPCseed*)array->At(index1); @@ -5688,7 +5688,7 @@ void AliTPCtrackerMI::FindV0s(TObjArray * array, AliESDEvent *esd) AliTPCseed * track0 = (AliTPCseed*)array->At(index0); AliTPCseed * track1 = (AliTPCseed*)array->At(index1); if (track0->TPCrPID(0)>0.3&&track1->TPCrPID(0)>0.3&&v0->GetAnglep()[2]<0.15) quality[i]+=1000000; // gamma conversion candidate - if (track0->TPCrPID(4)>0.9||track1->TPCrPID(4)>0.9&&minpulldca>4) quality[i]*=10; // lambda candidate candidate + if (track0->TPCrPID(4)>0.9||(track1->TPCrPID(4)>0.9&&minpulldca>4)) quality[i]*=10; // lambda candidate candidate } TMath::Sort(ncandidates,quality,indexes,kTRUE); diff --git a/ZDC/AliGenZDC.h b/ZDC/AliGenZDC.h index ebeb17a7694..1efedc12c50 100644 --- a/ZDC/AliGenZDC.h +++ b/ZDC/AliGenZDC.h @@ -46,8 +46,8 @@ public: void SetDebug(Int_t idebu) {fDebugOpt = idebu;}; // Getters - const Double_t GetFermi2p(Int_t key) {return fProbintp[key];} - const Double_t GetFermi2n(Int_t key) {return fProbintn[key];} + Double_t GetFermi2p(Int_t key) const {return fProbintp[key];} + Double_t GetFermi2n(Int_t key) const {return fProbintn[key];} protected: Int_t fIpart; // Particle to be generated -- 2.43.0