From 77f886333622e8bcadf3b7375cabe0ba1d500e86 Mon Sep 17 00:00:00 2001 From: fca Date: Tue, 28 Oct 2008 11:29:56 +0000 Subject: [PATCH] Effc++ warnings --- TPC/AliTPCCalibTCF.cxx | 2 +- TPC/AliTPCGoofieValues.h | 47 +++++++------ TPC/AliTPCMonitor.cxx | 14 ++-- TPC/AliTPCMonitorConfig.cxx | 2 +- TPC/AliTPCPid.cxx | 1 - TPC/AliTPCQADataMakerSim.h | 7 +- TPC/AliTPCTrackHitsV2.cxx | 34 +++++----- TPC/AliTPCcalibV0.h | 5 ++ TPC/AliTPCdataQA.cxx | 6 +- TPC/AliTPCtrackerMI.cxx | 132 ++++++++++++++++++------------------ 10 files changed, 131 insertions(+), 119 deletions(-) diff --git a/TPC/AliTPCCalibTCF.cxx b/TPC/AliTPCCalibTCF.cxx index afbf822b159..a39469c07d9 100644 --- a/TPC/AliTPCCalibTCF.cxx +++ b/TPC/AliTPCCalibTCF.cxx @@ -1757,7 +1757,7 @@ void AliTPCCalibTCF::MergeToOneFile(const char *nameFileSum) { printf("Sector file %s found\n",nameFileSumSec); TIter next(fileSumSec->GetListOfKeys()); - while( key=(TKey*)next() ) { + while( (key=(TKey*)next()) ) { const char *hisName = key->GetName(); hisIn=(TH1F*)fileSumSec->Get(hisName); diff --git a/TPC/AliTPCGoofieValues.h b/TPC/AliTPCGoofieValues.h index 483f94d3d98..a7ff54b985a 100644 --- a/TPC/AliTPCGoofieValues.h +++ b/TPC/AliTPCGoofieValues.h @@ -1,24 +1,24 @@ -/*!\class AliTPCGoofieValues - \brief TPC calibration class for Goofie values - - Header: AliTPCGoofieValues.h,v 2.0. - - Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. - - See cxx source for full Copyright notice - - TPC Calibration Class for GOOFIE values. Drift velocity, gas composition and the gain. - - The class AliTPCGoofieValues allows the access to GoofieValues. - - The only constructor is loading data from ASCI file. - - The methods make Tgraphs and TSplines of the time dependence of the values. - - One method allows save the the graphs and spline togather with tree of allvalues into file. - -*/ - +/*!\class AliTPCGoofieValues + \brief TPC calibration class for Goofie values + + Header: AliTPCGoofieValues.h,v 2.0. + + Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. + + See cxx source for full Copyright notice + + TPC Calibration Class for GOOFIE values. Drift velocity, gas composition and the gain. + + The class AliTPCGoofieValues allows the access to GoofieValues. + + The only constructor is loading data from ASCI file. + + The methods make Tgraphs and TSplines of the time dependence of the values. + + One method allows save the the graphs and spline togather with tree of allvalues into file. + +*/ + /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. * * See cxx source for full Copyright notice */ @@ -118,6 +118,11 @@ protected: protected: TTree *fGoofieValues; // tree with all Goofie values in branches + +private: + AliTPCGoofieValues(const AliTPCGoofieValues&); // Not implemented + AliTPCGoofieValues& operator=(const AliTPCGoofieValues&); // Not implemented + ClassDef(AliTPCGoofieValues,1) //Basic ROOT object }; diff --git a/TPC/AliTPCMonitor.cxx b/TPC/AliTPCMonitor.cxx index e11c3574340..4496356b9e6 100755 --- a/TPC/AliTPCMonitor.cxx +++ b/TPC/AliTPCMonitor.cxx @@ -2466,16 +2466,16 @@ Int_t AliTPCMonitor::GetRCUPatch(Int_t runid, Int_t eqid) const } //__________________________________________________________________ -void AliTPCMonitor::DumpHeader(AliRawReaderRoot * fReaderROOT) const +void AliTPCMonitor::DumpHeader(AliRawReaderRoot * readerROOT) const { // Dump Event header for ROOT format - cout << "EventHeader : fReaderROOT->GetEquipmentSize() :" << fReaderROOT->GetEquipmentSize() << endl; - cout << "EventHeader : fReaderROOT->GetType() :" << fReaderROOT->GetType() << endl; - cout << "EventHeader : fReaderROOT->GetRunNumber() :" << fReaderROOT->GetRunNumber() << endl; - cout << "EventHeader : fReaderROOT->GetEventId() :" << *(fReaderROOT->GetEventId()) << endl; - cout << "EventHeader : fReaderROOT->GetLDCId() :" << fReaderROOT->GetLDCId() << endl; - cout << "EventHeader : fReaderROOT->GetGDCId() :" << fReaderROOT->GetGDCId() << endl; + cout << "EventHeader : fReaderROOT->GetEquipmentSize() :" << readerROOT->GetEquipmentSize() << endl; + cout << "EventHeader : fReaderROOT->GetType() :" << readerROOT->GetType() << endl; + cout << "EventHeader : fReaderROOT->GetRunNumber() :" << readerROOT->GetRunNumber() << endl; + cout << "EventHeader : fReaderROOT->GetEventId() :" << *(readerROOT->GetEventId()) << endl; + cout << "EventHeader : fReaderROOT->GetLDCId() :" << readerROOT->GetLDCId() << endl; + cout << "EventHeader : fReaderROOT->GetGDCId() :" << readerROOT->GetGDCId() << endl; } //__________________________________________________________________ diff --git a/TPC/AliTPCMonitorConfig.cxx b/TPC/AliTPCMonitorConfig.cxx index 0c4c4a883b5..a4c89c8ed2a 100755 --- a/TPC/AliTPCMonitorConfig.cxx +++ b/TPC/AliTPCMonitorConfig.cxx @@ -285,7 +285,7 @@ void AliTPCMonitorConfig::ReadConfig(Char_t* nameconf) // Read base configuration from file // Update main window size - string line; + // string line; ifstream datin; datin.open(nameconf); diff --git a/TPC/AliTPCPid.cxx b/TPC/AliTPCPid.cxx index 1b177ae53ea..4946d119b5c 100644 --- a/TPC/AliTPCPid.cxx +++ b/TPC/AliTPCPid.cxx @@ -422,7 +422,6 @@ for(Int_t i=0;iGetEntries();i++) TVector xx( *((TVector*)trs->At(i)) ); if( xx.IsValid() && xx(0)>0 ) { - TVector xx( *((TVector*)trs->At(i)) ); if(xx(0)>=2) { // 1)Calculate Qtrm diff --git a/TPC/AliTPCQADataMakerSim.h b/TPC/AliTPCQADataMakerSim.h index 85c0f53f686..b7d45c4ec85 100644 --- a/TPC/AliTPCQADataMakerSim.h +++ b/TPC/AliTPCQADataMakerSim.h @@ -41,14 +41,17 @@ private: // Digits QA virtual void InitDigits(); virtual void MakeDigits(TTree *digitTree); + virtual void MakeDigits(TClonesArray *) {AliWarning("Method not implemented\n");} // Hits QA virtual void InitHits(); virtual void MakeHits(TTree *hitTree); + virtual void MakeHits(TClonesArray *) {AliWarning("Method not implemented\n");} // SDigits QA (empty) - virtual void InitSDigits() {;} - virtual void MakeSDigits(TTree* ) { AliInfo("AliTPCQADataMakerSim::MakeSDigits() method not supported"); } + virtual void InitSDigits() {} + virtual void MakeSDigits(TTree* ) {AliWarning("Method not implemented\n");} + virtual void MakeSDigits(TClonesArray* ) {AliWarning("Method not implemented\n");} TH1F* fHistDigitsADC; //! Digit ADC distribution diff --git a/TPC/AliTPCTrackHitsV2.cxx b/TPC/AliTPCTrackHitsV2.cxx index 7a5a1e43513..ada1a9ac151 100644 --- a/TPC/AliTPCTrackHitsV2.cxx +++ b/TPC/AliTPCTrackHitsV2.cxx @@ -598,38 +598,38 @@ Bool_t AliTPCTrackHitsV2::FlushHitStack(Bool_t force) dr = dl/ratio; oldr+=dr; //calculate precission - AliTrackHitsParamV2 ¶m = *(fTempInfo->GetParam()); + AliTrackHitsParamV2 ¶ml = *(fTempInfo->GetParam()); //real deltas - Double_t dr1= position[0]-param.GetR(); - Double_t dz = position[1]-param.GetZ(); - Double_t dfi = position[2]-param.GetFi(); + Double_t dr1= position[0]-paraml.GetR(); + Double_t dz = position[1]-paraml.GetZ(); + Double_t dfi = position[2]-paraml.GetFi(); //extrapolated deltas - Double_t dr2 = oldr-param.GetR(); + Double_t dr2 = oldr-paraml.GetR(); Double_t ddr = dr2-dr1; - Double_t ddz = dr2*param.GetTheta()+dr2*dr2*param.GetThetaD()-dz; - Double_t ddfi= dr2*param.GetAn()+dr2*dr2*param.GetAd()-dfi; + Double_t ddz = dr2*paraml.GetTheta()+dr2*dr2*paraml.GetThetaD()-dz; + Double_t ddfi= dr2*paraml.GetAn()+dr2*dr2*paraml.GetAd()-dfi; dd = TMath::Sqrt(ddz*ddz+oldr*oldr*ddfi*ddfi+ddr*ddr); if ( (dd>fPrecision) ){ //if ( (dd<0) ){ if (i==0){ - param.SetAn(0); - param.SetAd(0); - param.SetTheta(0); - param.SetThetaD(0); - Double_t ddz = dr2*param.GetTheta()+dr2*dr2*param.GetThetaD()-dz; - Double_t ddfi= dr2*param.GetAn()+dr2*dr2*param.GetAd()-dfi; + paraml.SetAn(0); + paraml.SetAd(0); + paraml.SetTheta(0); + paraml.SetThetaD(0); + Double_t ddz1 = dr2*paraml.GetTheta()+dr2*dr2*paraml.GetThetaD()-dz; + Double_t ddfi1= dr2*paraml.GetAn()+dr2*dr2*paraml.GetAd()-dfi; dl = 0; - dd = TMath::Sqrt(ddz*ddz+oldr*oldr*ddfi*ddfi+ddr*ddr); + dd = TMath::Sqrt(ddz1*ddz1+oldr*oldr*ddfi1*ddfi1+ddr*ddr); } else break; } - param.HitDistance(i)= Short_t(TMath::Nint(dl/fStep)); - param.Charge(i)= Short_t(fTempInfo->GetQStack(i)); - param.Time(i)= Short_t(fTempInfo->GetTimeStack(i)/AliTPCTrackHitsV2::fgkTimePrecision); + paraml.HitDistance(i)= Short_t(TMath::Nint(dl/fStep)); + paraml.Charge(i)= Short_t(fTempInfo->GetQStack(i)); + paraml.Time(i)= Short_t(fTempInfo->GetTimeStack(i)/AliTPCTrackHitsV2::fgkTimePrecision); } if (i<=fTempInfo->GetStackIndex()){ //if previous iteration not succesfull diff --git a/TPC/AliTPCcalibV0.h b/TPC/AliTPCcalibV0.h index 888ea97b7d7..05ff4c39fe8 100644 --- a/TPC/AliTPCcalibV0.h +++ b/TPC/AliTPCcalibV0.h @@ -51,6 +51,11 @@ public : protected: private: + + AliTPCcalibV0(const AliTPCcalibV0&); // Not implemented + AliTPCcalibV0& operator=(const AliTPCcalibV0&); // Not implemented + + AliStack *fStack; // pointer to kinematic tree AliESDEvent *fESD; //! current ED to proccess - NOT OWNER TDatabasePDG *fPdg; // particle database diff --git a/TPC/AliTPCdataQA.cxx b/TPC/AliTPCdataQA.cxx index a6715fa78a4..686b4bf83d5 100644 --- a/TPC/AliTPCdataQA.cxx +++ b/TPC/AliTPCdataQA.cxx @@ -625,9 +625,9 @@ void AliTPCdataQA::FindLocalMaxima(const Int_t iSector) if(i==0 && j==0) continue; - Float_t charge = GetQ(b, i, j, maxTimeBin, minT, maxT, minP, maxP); - qTot += charge; - if(charge>0) { + Float_t charge1 = GetQ(b, i, j, maxTimeBin, minT, maxT, minP, maxP); + qTot += charge1; + if(charge1>0) { // see if the next neighbor is also above threshold if(i*j==0) { qTot += GetQ(b, 2*i, 2*j, maxTimeBin, minT, maxT, minP, maxP); diff --git a/TPC/AliTPCtrackerMI.cxx b/TPC/AliTPCtrackerMI.cxx index ad8df463138..5bbb6ead3e4 100644 --- a/TPC/AliTPCtrackerMI.cxx +++ b/TPC/AliTPCtrackerMI.cxx @@ -394,14 +394,14 @@ AliTracker(), Int_t nrowup = par->GetNRowUp(); - for (Int_t i=0;iGetPadRowRadiiLow(i); fPadLength[i]= par->GetPadPitchLength(0,i); fYMax[i] = fXRow[i]*TMath::Tan(0.5*par->GetInnerAngle()); } - for (Int_t i=0;iGetPadRowRadiiUp(i); fPadLength[i+nrowlow] = par->GetPadPitchLength(60,i); fYMax[i+nrowlow] = fXRow[i+nrowlow]*TMath::Tan(0.5*par->GetOuterAngle()); @@ -1100,16 +1100,16 @@ Int_t AliTPCtrackerMI::LoadClusters(TObjArray *arr) AliTPCClustersRow *clrow = 0x0; Int_t lower = arr->LowerBound(); Int_t entries = arr->GetEntriesFast(); - + for (Int_t i=lower; iAt(i); - if(!clrow) continue; - if(!clrow->GetArray()) continue; - + if(!clrow) continue; + if(!clrow->GetArray()) continue; + // Int_t sec,row; fParam->AdjustSectorRow(clrow->GetID(),sec,row); - + for (Int_t icl=0; iclGetArray()->GetEntriesFast(); icl++){ Transform((AliTPCclusterMI*)(clrow->GetArray()->At(icl))); } @@ -1128,14 +1128,14 @@ Int_t AliTPCtrackerMI::LoadClusters(TObjArray *arr) if (left ==0){ tpcrow->SetN1(clrow->GetArray()->GetEntriesFast()); tpcrow->SetClusters1(new AliTPCclusterMI[tpcrow->GetN1()]); - for (Int_t i=0;iGetN1();i++) - tpcrow->SetCluster1(i, *(AliTPCclusterMI*)(clrow->GetArray()->At(i))); + for (Int_t j=0;jGetN1();++j) + tpcrow->SetCluster1(j, *(AliTPCclusterMI*)(clrow->GetArray()->At(j))); } if (left ==1){ tpcrow->SetN2(clrow->GetArray()->GetEntriesFast()); tpcrow->SetClusters2(new AliTPCclusterMI[tpcrow->GetN2()]); - for (Int_t i=0;iGetN2();i++) - tpcrow->SetCluster2(i,*(AliTPCclusterMI*)(clrow->GetArray()->At(i))); + for (Int_t j=0;jGetN2();++j) + tpcrow->SetCluster2(j,*(AliTPCclusterMI*)(clrow->GetArray()->At(j))); } } // @@ -1241,14 +1241,14 @@ Int_t AliTPCtrackerMI::LoadClusters() if (left ==0){ tpcrow->SetN1(clrow->GetArray()->GetEntriesFast()); tpcrow->SetClusters1(new AliTPCclusterMI[tpcrow->GetN1()]); - for (Int_t i=0;iGetN1();i++) - tpcrow->SetCluster1(i, *(AliTPCclusterMI*)(clrow->GetArray()->At(i))); + for (Int_t k=0;kGetN1();++k) + tpcrow->SetCluster1(k, *(AliTPCclusterMI*)(clrow->GetArray()->At(k))); } if (left ==1){ tpcrow->SetN2(clrow->GetArray()->GetEntriesFast()); tpcrow->SetClusters2(new AliTPCclusterMI[tpcrow->GetN2()]); - for (Int_t i=0;iGetN2();i++) - tpcrow->SetCluster2(i,*(AliTPCclusterMI*)(clrow->GetArray()->At(i))); + for (Int_t k=0;kGetN2();++k) + tpcrow->SetCluster2(k,*(AliTPCclusterMI*)(clrow->GetArray()->At(k))); } } // @@ -2517,10 +2517,10 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde isok =kTRUE; if (isok) - for (Int_t i=0; i<160; i++) { - Int_t index=pt->GetClusterIndex2(i); + for (Int_t j=0; j<160; ++j) { + Int_t index=pt->GetClusterIndex2(j); if (index<0) continue; - AliTPCclusterMI *c= pt->GetClusterPointer(i); + AliTPCclusterMI *c= pt->GetClusterPointer(j); if (!c) continue; //if (!(c->IsUsed(10))) c->Use(); c->Use(10); @@ -2559,11 +2559,11 @@ void AliTPCtrackerMI::SignClusters(TObjArray * arr, Float_t fnumber, Float_t fde if ((dens>mindens && pt->GetNumberOfClusters()>minn) && chiGetNumberOfClusters(); pt->SetBSigned(kTRUE); - for (Int_t i=0; i<160; i++) { + for (Int_t j=0; j<160; ++j) { - Int_t index=pt->GetClusterIndex2(i); + Int_t index=pt->GetClusterIndex2(j); if (index<0) continue; - AliTPCclusterMI *c= pt->GetClusterPointer(i); + AliTPCclusterMI *c= pt->GetClusterPointer(j); if (!c) continue; // if (!(c->IsUsed(10))) c->Use(); c->Use(10); @@ -3438,7 +3438,7 @@ void AliTPCtrackerMI::MakeSeeds5(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2, // if (!BuildSeed(kr1[is],kcl,0,x1,x2,x3,x,c)) continue; - UInt_t index=kr1.GetIndex(is); + index=kr1.GetIndex(is); seed->~AliTPCseed(); AliTPCseed *track=new(seed) AliTPCseed(x1, sec*alpha+shift, x, c, index); @@ -3600,9 +3600,9 @@ void AliTPCtrackerMI::MakeSeeds2(TObjArray * arr, Int_t sec, Int_t i1, Int_t i2, Int_t row = row0+ddrow*delta; kr = &(fSectors[sec][row]); Double_t xn = kr->GetX(); - Double_t ymax = fSectors->GetMaxY(row)-kr->GetDeadZone()-1.5; + Double_t ymax1 = fSectors->GetMaxY(row)-kr->GetDeadZone()-1.5; polytrack.GetFitPoint(xn,yn,zn); - if (TMath::Abs(yn)>ymax) continue; + if (TMath::Abs(yn)>ymax1) continue; nfoundable++; AliTPCclusterMI * cln = kr->FindNearest(yn,zn,roady,roadz); if (cln) { @@ -4871,10 +4871,10 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) // if (deltabest>6) continue; if (mindcar+mindcaz<40 && (hangles[2]<3.12||deltabest>3)) continue; - Bool_t sign =kFALSE; - if (hangles[2]>3.06) sign =kTRUE; + Bool_t lsign =kFALSE; + if (hangles[2]>3.06) lsign =kTRUE; // - if (sign){ + if (lsign){ circular[i0] = kTRUE; circular[i1] = kTRUE; if (track0->OneOverPt()OneOverPt()){ @@ -4886,7 +4886,7 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) track0->SetCircular(track0->GetCircular()+2); } } - if (sign&&AliTPCReconstructor::StreamLevel()>1){ + if (lsign&&AliTPCReconstructor::StreamLevel()>1){ //debug stream Int_t lab0=track0->GetLabel(); Int_t lab1=track1->GetLabel(); @@ -5000,15 +5000,15 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) Float_t dens00=-1,dens01=-1; Float_t dens10=-1,dens11=-1; // - Int_t found,foundable,shared; - track0->GetClusterStatistic(0,row0-5, found, foundable,shared,kFALSE); + Int_t found,foundable,ishared; + track0->GetClusterStatistic(0,row0-5, found, foundable,ishared,kFALSE); if (foundable>5) dens00 = Float_t(found)/Float_t(foundable); - track0->GetClusterStatistic(row0+5,155, found, foundable,shared,kFALSE); + track0->GetClusterStatistic(row0+5,155, found, foundable,ishared,kFALSE); if (foundable>5) dens01 = Float_t(found)/Float_t(foundable); // - track1->GetClusterStatistic(0,row0-5, found, foundable,shared,kFALSE); + track1->GetClusterStatistic(0,row0-5, found, foundable,ishared,kFALSE); if (foundable>10) dens10 = Float_t(found)/Float_t(foundable); - track1->GetClusterStatistic(row0+5,155, found, foundable,shared,kFALSE); + track1->GetClusterStatistic(row0+5,155, found, foundable,ishared,kFALSE); if (foundable>10) dens11 = Float_t(found)/Float_t(foundable); // if (dens00At(i); + AliKink *kinkl = (AliKink*)kinks->At(i); // // refit kinks towards vertex // - Int_t index0 = kink->GetIndex(0); - Int_t index1 = kink->GetIndex(1); + Int_t index0 = kinkl->GetIndex(0); + Int_t index1 = kinkl->GetIndex(1); AliTPCseed * ktrack0 = (AliTPCseed*)array->At(index0); AliTPCseed * ktrack1 = (AliTPCseed*)array->At(index1); // @@ -5151,10 +5151,10 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) // // Refit Kink under if too small angle // - if (kink->GetAngle(2)<0.05){ - kink->SetTPCRow0(GetRowNumber(kink->GetR())); - Int_t row0 = kink->GetTPCRow0(); - Int_t drow = Int_t(2.+0.5/(0.05+kink->GetAngle(2))); + if (kinkl->GetAngle(2)<0.05){ + kinkl->SetTPCRow0(GetRowNumber(kinkl->GetR())); + Int_t row0 = kinkl->GetTPCRow0(); + Int_t drow = Int_t(2.+0.5/(0.05+kinkl->GetAngle(2))); // // Int_t last = row0-drow; @@ -5169,9 +5169,9 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) AliTPCseed* seed1 = ReSeed(ktrack1,first,kTRUE); // if (seed0 && seed1){ - kink->SetStatus(1,8); - if (RefitKink(*seed0,*seed1,*kink)) kink->SetStatus(1,9); - row0 = GetRowNumber(kink->GetR()); + kinkl->SetStatus(1,8); + if (RefitKink(*seed0,*seed1,*kinkl)) kinkl->SetStatus(1,9); + row0 = GetRowNumber(kinkl->GetR()); sumn = seed0->GetNumberOfClusters()+seed1->GetNumberOfClusters(); mothers[i] = *seed0; daughters[i] = *seed1; @@ -5182,7 +5182,7 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) if (seed1) delete seed1; continue; } - if (kink->GetDistance()>0.5 || kink->GetR()<110 || kink->GetR()>240) { + if (kinkl->GetDistance()>0.5 || kinkl->GetR()<110 || kinkl->GetR()>240) { delete kinks->RemoveAt(i); if (seed0) delete seed0; if (seed1) delete seed1; @@ -5193,7 +5193,7 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) delete seed1; } // - if (kink) quality[i] = 160*((0.1+kink->GetDistance())*(2.-kink->GetTPCDensityFactor()))/(sumn+40.); //the longest -clossest will win + if (kinkl) quality[i] = 160*((0.1+kinkl->GetDistance())*(2.-kinkl->GetTPCDensityFactor()))/(sumn+40.); //the longest -clossest will win } TMath::Sort(nkinks,quality,indexes,kFALSE); // @@ -5268,23 +5268,23 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) for (Int_t i=0;iAt(indexes[i]); - if (!kink) continue; - 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; - 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; + AliKink * kinkl = (AliKink*) kinks->At(indexes[i]); + if (!kinkl) continue; + kinkl->SetTPCRow0(GetRowNumber(kinkl->GetR())); + Int_t index0 = kinkl->GetIndex(0); + Int_t index1 = kinkl->GetIndex(1); + if (circular[index0]||(circular[index1]&&kinkl->GetDistance()>0.2)) continue; + kinkl->SetMultiple(usage[index0],0); + kinkl->SetMultiple(usage[index1],1); + if (kinkl->GetMultiple()[0]+kinkl->GetMultiple()[1]>2) continue; + if (kinkl->GetMultiple()[0]+kinkl->GetMultiple()[1]>0 && quality[indexes[i]]>0.2) continue; + if (kinkl->GetMultiple()[0]+kinkl->GetMultiple()[1]>0 && kinkl->GetDistance()>0.2) continue; + if (circular[index0]||(circular[index1]&&kinkl->GetDistance()>0.1)) continue; AliTPCseed * ktrack0 = (AliTPCseed*)array->At(index0); AliTPCseed * ktrack1 = (AliTPCseed*)array->At(index1); if (!ktrack0 || !ktrack1) continue; - Int_t index = esd->AddKink(kink); + Int_t index = esd->AddKink(kinkl); // // if ( ktrack0->GetKinkIndex(0)==0 && ktrack1->GetKinkIndex(0)==0) { //best kink @@ -5325,15 +5325,15 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) if (!track0) continue; if (track0->Pt()<1.4) continue; //remove double high momenta tracks - overlapped with kink candidates - Int_t shared=0; + Int_t ishared=0; Int_t all =0; for (Int_t icl=track0->GetFirstPoint();iclGetLastPoint(); icl++){ if (track0->GetClusterPointer(icl)!=0){ all++; - if (track0->GetClusterPointer(icl)->IsUsed(10)) shared++; + if (track0->GetClusterPointer(icl)->IsUsed(10)) ishared++; } } - if (Float_t(shared+1)/Float_t(all+1)>0.5) { + if (Float_t(ishared+1)/Float_t(all+1)>0.5) { delete array->RemoveAt(i); continue; } @@ -5347,8 +5347,8 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) AliTPCseed & mother = *pmother; AliTPCseed & daughter = *pdaughter; - AliKink & kink = *pkink; - if (CheckKinkPoint(track0,mother,daughter, kink)){ + AliKink & kinkl = *pkink; + if (CheckKinkPoint(track0,mother,daughter, kinkl)){ if (mother.GetNumberOfClusters()<30||daughter.GetNumberOfClusters()<20) { delete pmother; delete pdaughter; @@ -5361,15 +5361,15 @@ void AliTPCtrackerMI::FindKinks(TObjArray * array, AliESDEvent *esd) delete pkink; continue; } - Int_t row0= kink.GetTPCRow0(); - if (kink.GetDistance()>0.5 || kink.GetR()<110. || kink.GetR()>240.) { + Int_t row0= kinkl.GetTPCRow0(); + if (kinkl.GetDistance()>0.5 || kinkl.GetR()<110. || kinkl.GetR()>240.) { delete pmother; delete pdaughter; delete pkink; continue; } // - Int_t index = esd->AddKink(&kink); + Int_t index = esd->AddKink(&kinkl); mother.SetKinkIndex(0,-(index+1)); daughter.SetKinkIndex(0,index+1); if (mother.GetNumberOfClusters()>50) { -- 2.43.5