Fix bug due to shadowed variables

[u/mrichter/AliRoot.git] / TRD / AliTRDQADataMakerRec.cxx

diff --git a/TRD/AliTRDQADataMakerRec.cxx b/TRD/AliTRDQADataMakerRec.cxx
index 5c10634c38bcbd70a50b296fc3563ace99bc80be..d49a257283757c0737f541b665484c8024d1752b 100644 (file)
--- a/TRD/AliTRDQADataMakerRec.cxx
+++ b/TRD/AliTRDQADataMakerRec.cxx
@@ -83,7 +83,7 @@ AliTRDQADataMakerRec& AliTRDQADataMakerRec::operator=(const AliTRDQADataMakerRec
 }
 
 //____________________________________________________________________________ 
 }
 
 //____________________________________________________________________________ 

-void AliTRDQADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX task, TObjArray * list)
+void AliTRDQADataMakerRec::EndOfDetectorCycle(AliQA::TASKINDEX_t task, TObjArray * list)

 {
   //
   // Detector specific actions at end of cycle
 {
   //
   // Detector specific actions at end of cycle


@@ -312,22 +312,24 @@ void AliTRDQADataMakerRec::InitESDs()
   const char *zoneName[4] = {"total charge", "ampilification range", "plateau", "TR range"};
  
   // prepare the scale from 0.1 to 10 GeV
   const char *zoneName[4] = {"total charge", "ampilification range", "plateau", "TR range"};
  
   // prepare the scale from 0.1 to 10 GeV

-  Double_t scalex[101];
-  Double_t dd = (TMath::Log(10) - TMath::Log(0.5)) / 100.;
-  for(Int_t ix=0; ix<101; ix++) {
+  const Int_t nscalex= 50;
+  Double_t scalex[nscalex+1];
+  Double_t dd = (TMath::Log(10) - TMath::Log(0.5)) / nscalex;
+  for(Int_t ix=0; ix<nscalex+1; ix++) {

     scalex[ix] = 0.5 * TMath::Exp(dd * ix);
   }
 
     scalex[ix] = 0.5 * TMath::Exp(dd * ix);
   }
 

-  Double_t scaley[101];
-  for(Int_t iy=0; iy<101; iy++) {
-    scaley[iy] = iy * (3e3/100.);
+  const Int_t nscaley = 50;
+  Double_t scaley[nscaley+1];
+  for(Int_t iy=0; iy<nscaley+1; iy++) {
+    scaley[iy] = iy * (3e3/nscaley);

   }
     
 
   for(Int_t i=0; i<4; i++) {
     hist[41+i] = new TH2D(Form("qaTRD_esd_signalPzone_%d",i), 
                          Form("%s;momentum (GeV/c);singal (a.u.)", zoneName[i]),
   }
     
 
   for(Int_t i=0; i<4; i++) {
     hist[41+i] = new TH2D(Form("qaTRD_esd_signalPzone_%d",i), 
                          Form("%s;momentum (GeV/c);singal (a.u.)", zoneName[i]),

-                         100, scalex, 100, scaley);
+                         nscalex, scalex, nscaley, scaley);

   }
 
   for(Int_t i=0; i<kNhist; i++) {
   }
 
   for(Int_t i=0; i<kNhist; i++) {


@@ -365,7 +367,7 @@ void AliTRDQADataMakerRec::InitRecPoints()
   hist[11] = new TProfile("qaTRD_recPoints_prf", ";distance;center of gravity"
                          , 120, -0.6, 0.6, -1.2, 1.2, "");
 
   hist[11] = new TProfile("qaTRD_recPoints_prf", ";distance;center of gravity"
                          , 120, -0.6, 0.6, -1.2, 1.2, "");
 

-  hist[12] = new TH1D("qaTRD_recPoints_ampMPV", ";amplitude MPV", 200, 0, 200);
+  hist[12] = new TH1D("qaTRD_recPoints_ampMPV", ";amplitude MPV", 150, 0, 150);

   hist[13] = new TH1D("qaTRD_recPoints_ampSigma", ";amplitude Sigma", 200, 0, 200); 
   
   // chamber by chamber
   hist[13] = new TH1D("qaTRD_recPoints_ampSigma", ";amplitude Sigma", 200, 0, 200); 
   
   // chamber by chamber


@@ -452,9 +454,9 @@ void AliTRDQADataMakerRec::MakeESDs(AliESDEvent * esd)
   GetESDsData(0)->Fill(nTracks);
 
   // track loop
   GetESDsData(0)->Fill(nTracks);
 
   // track loop

-  for (Int_t i=0; i<nTracks; i++) {
+  for (Int_t iTrack = 0; iTrack<nTracks; iTrack++) {

 
 

-    AliESDtrack *track = esd->GetTrack(i);
+    AliESDtrack *track = esd->GetTrack(iTrack);

     const AliExternalTrackParam *paramOut = track->GetOuterParam();
     const AliExternalTrackParam *paramIn = track->GetInnerParam();
 
     const AliExternalTrackParam *paramOut = track->GetOuterParam();
     const AliExternalTrackParam *paramIn = track->GetInnerParam();
 


@@ -519,18 +521,18 @@ void AliTRDQADataMakerRec::MakeESDs(AliESDEvent * esd)
     
     
     // dedx
     
     
     // 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++) {
       Double_t dedx = 0;
       for(Int_t j=0; j<6; j++) {

-       dedx += track->GetTRDsignals(j, i-1);
+       dedx += track->GetTRDslice(j, k-1);

       }
       }

-      GetESDsData(41+i)->Fill(paramOut->GetP(), dedx/6.);
+      GetESDsData(41+k)->Fill(paramOut->GetP(), dedx/6.);

     }
 
     // probabilities
     if (status & AliESDtrack::kTRDpid) {
     }
 
     // probabilities
     if (status & AliESDtrack::kTRDpid) {

-      for(Int_t i=0; i<AliPID::kSPECIES; i++) 
-       GetESDsData(36+i)->Fill(track->GetTRDpid(i));
+      for(Int_t k=0; k<AliPID::kSPECIES; ++k) 
+       GetESDsData(36+k)->Fill(track->GetTRDpid(k));

     }
 
     // probabilities uniformity
     }
 
     // probabilities uniformity