From: fca Date: Mon, 19 May 2008 14:58:18 +0000 (+0000) Subject: Removing shadowed variables X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=commitdiff_plain;h=7bce990c5ebfc372365da3ac0a8d59c25a9a901c Removing shadowed variables --- diff --git a/TRD/AliTRDCalibraFillHisto.cxx b/TRD/AliTRDCalibraFillHisto.cxx index 620e9c8151f..544664402c9 100644 --- a/TRD/AliTRDCalibraFillHisto.cxx +++ b/TRD/AliTRDCalibraFillHisto.cxx @@ -645,8 +645,8 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(AliTRDtrackV1 *t) // loop over the clusters //////////////////////////// Int_t nbclusters = 0; - for(int ic=0; icGetClusters(ic))) continue; + for(int jc=0; jcGetClusters(jc))) continue; nbclusters++; // Store the info bis of the tracklet @@ -656,7 +656,7 @@ Bool_t AliTRDCalibraFillHisto::UpdateHistogramsV1(AliTRDtrackV1 *t) Int_t group[2] = {0,0}; if(fCH2dOn) group[0] = CalculateCalibrationGroup(0,row,col); if(fPH2dOn) group[1] = CalculateCalibrationGroup(1,row,col); - StoreInfoCHPHtrack(cl, tracklet->GetdQdl(ic),group,row,col); + StoreInfoCHPHtrack(cl, tracklet->GetdQdl(jc),group,row,col); } //////////////////////////////////////// @@ -1041,13 +1041,13 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtracklet(AliTRDtrack *t, Int_t index0, I Double_t time = cl->GetPadTime(); //Calculate x if possible Float_t xcenter = 0.0; - Bool_t echec = kTRUE; + Bool_t echec1 = kTRUE; if((time<=7) || (time>=21)) continue; // Center 3 balanced: position with the center of the pad if ((((Float_t) signals[3]) > 0.0) && (((Float_t) signals[2]) > 0.0) && (((Float_t) signals[4]) > 0.0)) { - echec = kFALSE; + echec1 = kFALSE; // Security if the denomiateur is 0 if ((((Float_t) (((Float_t) signals[3]) * ((Float_t) signals[3]))) / ((Float_t) (((Float_t) signals[2]) * ((Float_t) signals[4])))) != 1.0) { @@ -1056,7 +1056,7 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtracklet(AliTRDtrack *t, Int_t index0, I / ((Float_t) (((Float_t) signals[2]) * ((Float_t) signals[4]))))); } else { - echec = kTRUE; + echec1 = kTRUE; } } if(TMath::Abs(xcenter) > 0.5) echec = kTRUE; @@ -1348,7 +1348,7 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, if((time<=7) || (time>=21)) continue; Short_t *signals = cl->GetSignals(); Float_t xcenter = 0.0; - Bool_t echec = kTRUE; + Bool_t echec1 = kTRUE; ///////////////////////////////////////////////////////////// // Center 3 balanced: position with the center of the pad @@ -1356,7 +1356,7 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, if ((((Float_t) signals[3]) > 0.0) && (((Float_t) signals[2]) > 0.0) && (((Float_t) signals[4]) > 0.0)) { - echec = kFALSE; + echec1 = kFALSE; // Security if the denomiateur is 0 if ((((Float_t) (((Float_t) signals[3]) * ((Float_t) signals[3]))) / ((Float_t) (((Float_t) signals[2]) * ((Float_t) signals[4])))) != 1.0) { @@ -1365,14 +1365,14 @@ Bool_t AliTRDCalibraFillHisto::HandlePRFtrackletV1(const AliTRDseedV1 *tracklet, / ((Float_t) (((Float_t) signals[2]) * ((Float_t) signals[4]))))); } else { - echec = kTRUE; + echec1 = kTRUE; } } - if(TMath::Abs(xcenter) > 0.5) echec = kTRUE; - if(echec) continue; + if(TMath::Abs(xcenter) > 0.5) echec1 = kTRUE; + if(echec1) continue; //////////////////////////////////////////////////////// - //if no echec: calculate with the position of the pad + //if no echec1: calculate with the position of the pad // Position of the cluster // fill the linear fitter /////////////////////////////////////////////////////// diff --git a/TRD/AliTRDCalibraFit.cxx b/TRD/AliTRDCalibraFit.cxx index c1af6626034..e8daed9c57e 100644 --- a/TRD/AliTRDCalibraFit.cxx +++ b/TRD/AliTRDCalibraFit.cxx @@ -474,9 +474,9 @@ Bool_t AliTRDCalibraFit::AnalyseCH(AliTRDCalibraVector *calvect) Bool_t something = kTRUE; if(!calvect->GetCHEntries(fCountDet)) something = kFALSE; if(something){ - TString name("CH"); - name += idect; - projch = calvect->ConvertVectorCHHisto(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(0)*fCalibraMode->GetNfragRphi(0)))),(const char *) name); + TString tname("CH"); + tname += idect; + projch = calvect->ConvertVectorCHHisto(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(0)*fCalibraMode->GetNfragRphi(0)))),(const char *) tname); projch->SetDirectory(0); for (Int_t k = 0; k < calvect->GetNumberBinCharge(); k++) { nentries += projch->GetBinContent(k+1); @@ -662,9 +662,9 @@ Bool_t AliTRDCalibraFit::AnalysePH(AliTRDCalibraVector *calvect) Bool_t something = kTRUE; if(!calvect->GetPHEntries(fCountDet)) something = kFALSE; if(something){ - TString name("PH"); - name += idect; - projph = CorrectTheError((TGraphErrors *) (calvect->ConvertVectorPHTGraphErrors(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(1)*fCalibraMode->GetNfragRphi(1)))),(const char *) name))); + TString tname("PH"); + tname += idect; + projph = CorrectTheError((TGraphErrors *) (calvect->ConvertVectorPHTGraphErrors(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(1)*fCalibraMode->GetNfragRphi(1)))),(const char *) tname))); projph->SetDirectory(0); } //printf("The number of entries for the group %d is %d\n",idect,fEntriesCurrent); @@ -933,9 +933,9 @@ Bool_t AliTRDCalibraFit::AnalysePRF(AliTRDCalibraVector *calvect) Bool_t something = kTRUE; if(!calvect->GetPRFEntries(fCountDet)) something = kFALSE; if(something){ - TString name("PRF"); - name += idect; - projprf = CorrectTheError((TGraphErrors *) (calvect->ConvertVectorPRFTGraphErrors(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(1)*fCalibraMode->GetNfragRphi(1)))),(const char *) name))); + TString tname("PRF"); + tname += idect; + projprf = CorrectTheError((TGraphErrors *) (calvect->ConvertVectorPRFTGraphErrors(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(1)*fCalibraMode->GetNfragRphi(1)))),(const char *) tname))); projprf->SetDirectory(0); } // This detector has not enough statistics or was off @@ -1028,9 +1028,9 @@ Bool_t AliTRDCalibraFit::AnalysePRFMarianFit(AliTRDCalibraVector *calvect) Bool_t something = kTRUE; if(!calvect->GetPRFEntries(fCountDet)) something = kFALSE; if(something){ - TString name("PRF"); - name += idect; - projprftree = calvect->ConvertVectorPRFTGraphErrors(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(1)*fCalibraMode->GetNfragRphi(1)))),(const char *) name); + TString tname("PRF"); + tname += idect; + projprftree = calvect->ConvertVectorPRFTGraphErrors(fCountDet,(idect-(fCount-(fCalibraMode->GetNfragZ(1)*fCalibraMode->GetNfragRphi(1)))),(const char *) tname); nbins = projprftree->GetN(); arrayx = (Double_t *)projprftree->GetX(); arraye = (Double_t *)projprftree->GetEX(); @@ -3806,7 +3806,7 @@ Bool_t AliTRDCalibraFit::FitPRFGausMI(Double_t *arraye, Double_t *arraym, Double } } //_____________________________________________________________________________ -Double_t AliTRDCalibraFit::FitGausMI(Double_t *arraye, Double_t *arraym, Double_t *arrayme, Int_t nBins, Float_t xMin, Float_t xMax, TVectorD *param, Bool_t kError) +Double_t AliTRDCalibraFit::FitGausMI(Double_t *arraye, Double_t *arraym, Double_t *arrayme, Int_t nBins, Float_t xMin, Float_t xMax, TVectorD *param, Bool_t bError) { // // Fit methode for the sigma of the pad response function @@ -3847,7 +3847,7 @@ Double_t AliTRDCalibraFit::FitGausMI(Double_t *arraye, Double_t *arraym, Double_ errorm = 0.0; errorn = 0.0; error = 0.0; - if(!kError){ + if(!bError){ if((valueI + 0.01) > 0.0) errorm = TMath::Log((valueI + 0.01)/valueI); if((valueI - 0.01) > 0.0) errorn = TMath::Log((valueI - 0.01)/valueI); error = TMath::Max(TMath::Abs(errorm),TMath::Abs(errorn)); @@ -3888,7 +3888,7 @@ Double_t AliTRDCalibraFit::FitGausMI(Double_t *arraye, Double_t *arraym, Double_ "errorm="< 0.1){ - if(kError){ + if(bError){ chi2 = FitGausMI(arraye,arraym,arrayme,nBins,xMin,xMax,param,kFALSE); } else return -4.0; diff --git a/TRD/AliTRDQAChecker.h b/TRD/AliTRDQAChecker.h index 125c2176986..477e9611a41 100644 --- a/TRD/AliTRDQAChecker.h +++ b/TRD/AliTRDQAChecker.h @@ -34,9 +34,9 @@ public: AliTRDQAChecker& operator = (const AliTRDQAChecker& qac) ; virtual ~AliTRDQAChecker() {;} // dtor - virtual const Double_t Check(AliQA::ALITASK_t index) {return 1.0;} + virtual const Double_t Check(AliQA::ALITASK_t /*index*/) {return 1.0;} virtual const Double_t Check(TList * /*list*/) {return 1.0;} - virtual const Double_t Check(AliQA::ALITASK_t index, TObjArray * /*list*/) {return 1.0;} + virtual const Double_t Check(AliQA::ALITASK_t /*index*/, TObjArray * /*list*/) {return 1.0;} private: diff --git a/TRD/AliTRDQADataMakerRec.cxx b/TRD/AliTRDQADataMakerRec.cxx index 0665a0cf853..127a82d85cc 100644 --- a/TRD/AliTRDQADataMakerRec.cxx +++ b/TRD/AliTRDQADataMakerRec.cxx @@ -521,18 +521,18 @@ void AliTRDQADataMakerRec::MakeESDs(AliESDEvent * esd) // dedx - for(Int_t i=0; i<4; i++) { + for(Int_t k=0; k<4; ++k) { Double_t dedx = 0; for(Int_t j=0; j<6; j++) { - dedx += track->GetTRDslice(j, i-1); + dedx += track->GetTRDslice(j, k-1); } GetESDsData(41+i)->Fill(paramOut->GetP(), dedx/6.); } // probabilities if (status & AliESDtrack::kTRDpid) { - for(Int_t i=0; iFill(track->GetTRDpid(i)); + for(Int_t k=0; kFill(track->GetTRDpid(k)); } // probabilities uniformity diff --git a/TRD/AliTRDalignment.cxx b/TRD/AliTRDalignment.cxx index a3820e5061b..2517a45be0d 100644 --- a/TRD/AliTRDalignment.cxx +++ b/TRD/AliTRDalignment.cxx @@ -831,8 +831,8 @@ void AliTRDalignment::ReadSurveyReport(AliSurveyObj *so) // the right place in the arrays fSurveyX etc. TObjArray *points = so->GetData(); - for (int i = 0; iGetEntries(); i++) { - AliSurveyPoint *po = (AliSurveyPoint *) points->At(i); + for (int ip = 0; ipGetEntries(); ++ip) { + AliSurveyPoint *po = (AliSurveyPoint *) points->At(ip); TString pna = po->GetPointName(); Int_t i,j,k,l; if (DecodeSurveyPointName(pna,i,j,k,l)) { diff --git a/TRD/AliTRDtracker.cxx b/TRD/AliTRDtracker.cxx index 83e352e93bf..7ffe79b476e 100644 --- a/TRD/AliTRDtracker.cxx +++ b/TRD/AliTRDtracker.cxx @@ -709,19 +709,19 @@ Int_t AliTRDtracker::RefitInward(AliESDEvent *event) AliTRDtrack *pt = new AliTRDtrack(seed2,seed2.GetAlpha()); Int_t *indexes2 = seed2.GetIndexes(); - for (Int_t i = 0; i < AliTRDtrack::kNplane;i++) { + for (Int_t l = 0; l < AliTRDtrack::kNplane;++l) { for (Int_t j = 0; j < AliTRDtrack::kNslice;j++) { - pt->SetPIDsignals(seed2.GetPIDsignals(i,j),i,j); + pt->SetPIDsignals(seed2.GetPIDsignals(l,j),l,j); } - pt->SetPIDTimBin(seed2.GetPIDTimBin(i),i); + pt->SetPIDTimBin(seed2.GetPIDTimBin(l),l); } Int_t *indexes3 = pt->GetBackupIndexes(); - for (Int_t i = 0; i < 200;i++) { - if (indexes2[i] == 0) { + for (Int_t l = 0; l < 200;++l) { + if (indexes2[l] == 0) { break; } - indexes3[i] = indexes2[i]; + indexes3[l] = indexes2[l]; } FollowProlongation(*pt); @@ -738,11 +738,11 @@ Int_t AliTRDtracker::RefitInward(AliESDEvent *event) seed->UpdateTrackParams(pt,AliESDtrack::kTRDrefit); fHRefit->Fill(5); - for (Int_t i = 0; i < AliTRDtrack::kNplane; i++) { + for (Int_t l = 0; l < AliTRDtrack::kNplane; ++l) { for (Int_t j = 0; j < AliTRDtrack::kNslice; j++) { - seed->SetTRDslice(pt->GetPIDsignals(i,j),i,j); + seed->SetTRDslice(pt->GetPIDsignals(l,j),l,j); } - seed->SetTRDTimBin(pt->GetPIDTimBin(i),i); + seed->SetTRDTimBin(pt->GetPIDTimBin(l),l); } } @@ -750,10 +750,10 @@ Int_t AliTRDtracker::RefitInward(AliESDEvent *event) // If not prolongation to TPC - propagate without update fHRefit->Fill(5); - AliTRDtrack *seed2 = new AliTRDtrack(*seed); - seed2->ResetCovariance(5.0); - AliTRDtrack *pt2 = new AliTRDtrack(*seed2,seed2->GetAlpha()); - delete seed2; + AliTRDtrack *seed2t = new AliTRDtrack(*seed); + seed2t->ResetCovariance(5.0); + AliTRDtrack *pt2 = new AliTRDtrack(*seed2t,seed2t->GetAlpha()); + delete seed2t; if (PropagateToX(*pt2,xTPC,fgkMaxStep)) { @@ -762,11 +762,11 @@ Int_t AliTRDtracker::RefitInward(AliESDEvent *event) seed->UpdateTrackParams(pt2,AliESDtrack::kTRDrefit); fHRefit->Fill(6); - for (Int_t i = 0; i < AliTRDtrack::kNplane; i++) { + for (Int_t l = 0; l < AliTRDtrack::kNplane; ++l) { for (Int_t j = 0; j < AliTRDtrack::kNslice; j++) { - seed->SetTRDslice(pt2->GetPIDsignals(i,j),i,j); + seed->SetTRDslice(pt2->GetPIDsignals(l,j),l,j); } - seed->SetTRDTimBin(pt2->GetPIDTimBin(i),i); + seed->SetTRDTimBin(pt2->GetPIDTimBin(l),l); } } @@ -912,7 +912,7 @@ Int_t AliTRDtracker::FollowProlongation(AliTRDtrack &t) t.SetSampledEdx(TMath::Abs(cl->GetQ()/dxsample)); Double_t h01 = GetTiltFactor(cl); Int_t det = cl->GetDetector(); - Int_t plane = fGeom->GetPlane(det); + Int_t pplane = fGeom->GetPlane(det); if (t.GetX() > 345.0) { t.SetNLast(t.GetNLast() + 1); @@ -927,7 +927,7 @@ Int_t AliTRDtracker::FollowProlongation(AliTRDtrack &t) maxChi2 = t.GetPredictedChi2(cl,h01); if (maxChi2 < 1e+10) { - if (!t.UpdateMI(cl,maxChi2,index,h01,plane)) { + if (!t.UpdateMI(cl,maxChi2,index,h01,pplane)) { // ???? } else { @@ -1605,7 +1605,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) cseed[sLayer+jLayer].SetPadLength(padlength[sLayer+jLayer]); cseed[sLayer+jLayer].SetX0(xcl[sLayer+jLayer]); - for (Int_t iter = 0; iter < 2; iter++) { + for (Int_t jter = 0; jter < 2; jter++) { // // In iteration 0 we try only one pad-row @@ -1613,7 +1613,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) // AliTRDseed tseed = cseed[sLayer+jLayer]; Float_t roadz = padlength[sLayer+jLayer] * 0.5; - if (iter > 0) { + if (jter > 0) { roadz = padlength[sLayer+jLayer]; } @@ -1625,7 +1625,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) Double_t dxlayer = layer.GetX() - xcl[sLayer+jLayer]; Double_t zexp = cl[sLayer+jLayer]->GetZ(); - if (iter > 0) { + if (jter > 0) { // Try 2 pad-rows in second iteration zexp = tseed.GetZref(0) + tseed.GetZref(1) * dxlayer; if (zexp > cl[sLayer+jLayer]->GetZ()) { @@ -1641,13 +1641,13 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) if (index <= 0) { continue; } - AliTRDcluster *cl = (AliTRDcluster *) GetCluster(index); + AliTRDcluster *clu = (AliTRDcluster *) GetCluster(index); tseed.SetIndexes(iTime,index); - tseed.SetClusters(iTime,cl); // Register cluster - tseed.SetX(iTime,dxlayer); // Register cluster - tseed.SetY(iTime,cl->GetY()); // Register cluster - tseed.SetZ(iTime,cl->GetZ()); // Register cluster + tseed.SetClusters(iTime,clu); // Register cluster + tseed.SetX(iTime,dxlayer); // Register cluster + tseed.SetY(iTime,clu->GetY()); // Register cluster + tseed.SetZ(iTime,clu->GetZ()); // Register cluster } @@ -1658,7 +1658,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) Float_t tquality = (18.0 - tseed.GetN2()) / 2.0 + TMath::Abs(dangle) / 0.1 + TMath::Abs(tseed.GetYfit(0) - tseed.GetYref(0)) / 0.2 + 2.0 * TMath::Abs(tseed.GetMeanz() - tseed.GetZref(0)) / padlength[jLayer]; - if ((iter == 0) && tseed.IsOK()) { + if ((jter == 0) && tseed.IsOK()) { cseed[sLayer+jLayer] = tseed; quality = tquality; if (tquality < 5) { @@ -1669,7 +1669,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) cseed[sLayer+jLayer] = tseed; } - } // Loop: iter + } // Loop: jter if (!cseed[sLayer+jLayer].IsOK()) { isOK = kFALSE; @@ -1810,7 +1810,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) Float_t zexp = cseed[jLayer].GetZref(0); Double_t zroad = padlength[jLayer] * 0.5 + 1.0; - for (Int_t iter = 0; iter < 2; iter++) { + for (Int_t jter = 0; jter < 2; jter++) { AliTRDseed tseed = cseed[jLayer]; Float_t quality = 10000.0; @@ -1824,12 +1824,12 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) if (index <= 0) { continue; } - AliTRDcluster *cl = (AliTRDcluster *) GetCluster(index); + AliTRDcluster *clu = (AliTRDcluster *) GetCluster(index); tseed.SetIndexes(iTime,index); - tseed.SetClusters(iTime,cl); // Register cluster - tseed.SetX(iTime,dxlayer); // Register cluster - tseed.SetY(iTime,cl->GetY()); // Register cluster - tseed.SetZ(iTime,cl->GetZ()); // Register cluster + tseed.SetClusters(iTime,clu); // Register cluster + tseed.SetX(iTime,dxlayer); // Register cluster + tseed.SetY(iTime,clu->GetY()); // Register cluster + tseed.SetZ(iTime,clu->GetZ()); // Register cluster } tseed.Update(); @@ -1846,7 +1846,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) zroad *= 2.0; - } // Loop: iter + } // Loop: jter if ( cseed[jLayer].IsOK()) { cseed[jLayer].CookLabels(); @@ -1866,7 +1866,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) Float_t lastchi2 = 10000.0; Float_t chi2 = 1000.0; - for (Int_t iter = 0; iter < 4; iter++) { + for (Int_t jter = 0; jter < 4; jter++) { // Sort tracklets according "quality", try to "improve" 4 worst Float_t sumquality = 0.0; @@ -1895,7 +1895,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) } lastquality = sumquality; lastchi2 = chi2; - if (iter > 0) { + if (jter > 0) { for (Int_t jLayer = 0; jLayer < 6; jLayer++) { cseed[jLayer] = bseed[jLayer]; } @@ -1930,13 +1930,13 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) if (index <= 0) { continue; } - AliTRDcluster *cl = (AliTRDcluster *) GetCluster(index); + AliTRDcluster *clu = (AliTRDcluster *) GetCluster(index); tseed.SetIndexes(iTime,index); - tseed.SetClusters(iTime,cl); // Register cluster - tseed.SetX(iTime,dxlayer); // Register cluster - tseed.SetY(iTime,cl->GetY()); // Register cluster - tseed.SetZ(iTime,cl->GetZ()); // Register cluster + tseed.SetClusters(iTime,clu); // Register cluster + tseed.SetX(iTime,dxlayer); // Register cluster + tseed.SetY(iTime,clu->GetY()); // Register cluster + tseed.SetZ(iTime,clu->GetZ()); // Register cluster } @@ -1957,7 +1957,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) chi2 = AliTRDseed::FitRiemanTilt(bseed,kTRUE); - } // Loop: iter + } // Loop: jter nclusters = 0; nlayers = 0; @@ -2280,7 +2280,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) signedseed[i] = kFALSE; } - for (Int_t iter = 0; iter < 5; iter++) { + for (Int_t jter = 0; jter < 5; jter++) { for (Int_t iseed = 0; iseed < registered; iseed++) { @@ -2328,7 +2328,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) continue; } - if (iter == 0) { + if (jter == 0) { if (nlayers < 6) { continue; } @@ -2337,7 +2337,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) } } - if (iter == 1) { + if (jter == 1) { if (nlayers < findable) { continue; } @@ -2346,7 +2346,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) } } - if (iter == 2) { + if (jter == 2) { if ((nlayers == findable) || (nlayers == 6)) { continue; @@ -2356,13 +2356,13 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) } } - if (iter == 3) { + if (jter == 3) { if (TMath::Log(0.000000001+seedquality2[index]) < -5.0) { continue; } } - if (iter == 4) { + if (jter == 4) { if (TMath::Log(0.000000001+seedquality2[index]) - nused/(nlayers-3.0) < -15.0) { continue; } @@ -2418,7 +2418,6 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) esdtrack.UpdateTrackParams(track,AliESDtrack::kTRDout); esdtrack.SetLabel(label); esd->AddTrack(&esdtrack); - TTreeSRedirector &cstream = *fDebugStreamer; if (AliTRDReconstructor::StreamLevel() > 0) { cstream << "Tracks" << "EventNrInFile=" << eventNrInFile @@ -2431,7 +2430,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) if (AliTRDReconstructor::StreamLevel() > 0) { cstream << "Seeds2" - << "Iter=" << iter + << "Iter=" << jter << "Track.=" << track << "Like=" << seedquality[index] << "LikeF=" << seedquality2[index] @@ -2457,7 +2456,7 @@ Int_t AliTRDtracker::Clusters2Tracks(AliESDEvent *esd) } // Loop: iseed - } // Loop: iter + } // Loop: jter } // End of loop over sectors @@ -3502,7 +3501,7 @@ Int_t AliTRDtracker::FindClusters(Int_t sector, Int_t t0, Int_t t1 // // Update best hypothesy if better chi2 according tracklet position and angle // - Double_t sy2 = smean[iter] + track->GetSigmaY2(); + sy2 = smean[iter] + track->GetSigmaY2(); Double_t sa2 = sangle[iter] + track->GetSigmaSnp2(); // track->fCee; Double_t say = track->GetSigmaSnpY(); // track->fCey; diff --git a/TRD/AliTRDtrackerV1.cxx b/TRD/AliTRDtrackerV1.cxx index f3008adc733..fb7e1ca43b1 100644 --- a/TRD/AliTRDtrackerV1.cxx +++ b/TRD/AliTRDtrackerV1.cxx @@ -1976,16 +1976,16 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss // try attaching clusters to tracklets Int_t nUsedCl = 0; - Int_t nlayers = 0; + Int_t mlayers = 0; for(int iLayer=0; iLayer 25) break; - nlayers++; + mlayers++; } - if(nlayers < kNSeedPlanes){ - //AliInfo(Form("Failed updating all seeds %d [%d].", nlayers, kNSeedPlanes)); + if(mlayers < kNSeedPlanes){ + //AliInfo(Form("Failed updating all seeds %d [%d].", mlayers, kNSeedPlanes)); AliTRDtrackerDebug::SetCandidateNumber(AliTRDtrackerDebug::GetCandidateNumber() + 1); continue; } @@ -2027,9 +2027,9 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss // fit extrapolated seed if ((jLayer == 0) && !(cseed[1].IsOK())) continue; if ((jLayer == 5) && !(cseed[4].IsOK())) continue; - AliTRDseedV1 tseed = cseed[jLayer]; - if(!tseed.AttachClustersIter(chamber, 1000.)) continue; - cseed[jLayer] = tseed; + AliTRDseedV1 pseed = cseed[jLayer]; + if(!pseed.AttachClustersIter(chamber, 1000.)) continue; + cseed[jLayer] = pseed; nusedf += cseed[jLayer].GetNUsed(); // debug value FitTiltedRieman(cseed, kTRUE); } @@ -2062,14 +2062,14 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss // fit full track and cook likelihoods // Double_t curv = FitRieman(&cseed[0], chi2); - // Double_t chi2ZF = chi2[0] / TMath::Max((nlayers - 3.), 1.); - // Double_t chi2RF = chi2[1] / TMath::Max((nlayers - 3.), 1.); + // Double_t chi2ZF = chi2[0] / TMath::Max((mlayers - 3.), 1.); + // Double_t chi2RF = chi2[1] / TMath::Max((mlayers - 3.), 1.); // do the final track fitting (Once with vertex constraint and once without vertex constraint) Double_t chi2Vals[3]; chi2Vals[0] = FitTiltedRieman(&cseed[0], kFALSE); chi2Vals[1] = FitTiltedRiemanConstraint(&cseed[0], GetZ()); - chi2Vals[2] = GetChi2Z(&cseed[0]) / TMath::Max((nlayers - 3.), 1.); + chi2Vals[2] = GetChi2Z(&cseed[0]) / TMath::Max((mlayers - 3.), 1.); // Chi2 definitions in testing stage //chi2Vals[2] = GetChi2ZTest(&cseed[0]); fTrackQuality[ntracks] = CalculateTrackLikelihood(&cseed[0], &chi2Vals[0]); @@ -2111,7 +2111,7 @@ Int_t AliTRDtrackerV1::MakeSeeds(AliTRDtrackingChamber **stack, AliTRDseedV1 *ss << "CandidateNumber=" << candidateNumber << "Chi2TR=" << chi2Vals[0] << "Chi2TC=" << chi2Vals[1] - << "Nlayers=" << nlayers + << "Nlayers=" << mlayers << "NUsedS=" << nUsedCl << "NUsed=" << nusedf << "Like=" << like diff --git a/TRD/qaAnalysis/AliTRDqaEnergyDeposit.cxx b/TRD/qaAnalysis/AliTRDqaEnergyDeposit.cxx index f18eeba3361..e963c4bf46b 100644 --- a/TRD/qaAnalysis/AliTRDqaEnergyDeposit.cxx +++ b/TRD/qaAnalysis/AliTRDqaEnergyDeposit.cxx @@ -185,17 +185,17 @@ void AliTRDqaEnergyDeposit::Exec(Option_t *) Double_t pt = paramOut->Pt(); Double_t signal = 0; - for(Int_t i=0; i<6; i++) - signal += track->GetTRDslice(i, -1); + for(Int_t k=0; k<6; ++k) + signal += track->GetTRDslice(k, -1); signal /= 6; fSignalPtSum[idx]->Fill(pt, signal); - for(Int_t i=0; iGetTRDpid(i); - fProb[AliPID::kSPECIES*idx+i]->Fill(lq); - if (lq > 0.8) fSignalPtType[AliPID::kSPECIES*idx+i]->Fill(pt, signal); + Double_t lq = track->GetTRDpid(k); + fProb[AliPID::kSPECIES*idx+k]->Fill(lq); + if (lq > 0.8) fSignalPtType[AliPID::kSPECIES*idx+k]->Fill(pt, signal); } } diff --git a/TRD/qaAnalysis/AliTRDqaJPsi.cxx b/TRD/qaAnalysis/AliTRDqaJPsi.cxx index 0a6e26e0094..6a609fa53ea 100644 --- a/TRD/qaAnalysis/AliTRDqaJPsi.cxx +++ b/TRD/qaAnalysis/AliTRDqaJPsi.cxx @@ -207,8 +207,8 @@ void AliTRDqaJPsi::Exec(Option_t *) Int_t pdg = (charge == 0)? -11 : 11; for(Int_t k=0; kGetAlpha()); fnKFtracks++; @@ -251,8 +251,8 @@ void AliTRDqaJPsi::Exec(Option_t *) if (!fInSample[i][k]) continue; for(Int_t j=i+1; jFill(jpsi.GetMass()); fInvMassVec[k]->Fill(jpsiVec.M()); fInvMassDiff[k]->Fill(jpsiVec.M() - jpsi.GetMass()); diff --git a/TRD/qaAnalysis/AliTRDqaJPsi.h b/TRD/qaAnalysis/AliTRDqaJPsi.h index 8d8619a2c0b..18367bc9e26 100644 --- a/TRD/qaAnalysis/AliTRDqaJPsi.h +++ b/TRD/qaAnalysis/AliTRDqaJPsi.h @@ -62,8 +62,8 @@ class AliTRDqaJPsi : public AliAnalysisTask { TH2D *fPtAngle[knSteps]; // tracks - AliKFParticle *tracks[1000]; - TLorentzVector *vec[1000]; + AliKFParticle *fTracks[1000]; + TLorentzVector *fVec[1000]; Int_t fInSample[1000][knSteps]; Int_t fSM[1000]; Int_t fnKFtracks; //[2];