Moving to standard names

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

diff --git a/TRD/AliTRDQADataMakerRec.cxx b/TRD/AliTRDQADataMakerRec.cxx
index c3c4af3001b34ec1b8900989bd8ec3e65bb79956..0030c8930e29aeb0276a0b4b775722b7ee5dabd6 100644 (file)
--- a/TRD/AliTRDQADataMakerRec.cxx
+++ b/TRD/AliTRDQADataMakerRec.cxx
@@ -38,6 +38,7 @@
 // --- AliRoot header files ---
 #include "AliESDEvent.h"
 #include "AliLog.h"
+#include "AliRawReader.h"
 #include "AliTRDcluster.h"
 #include "AliTRDQADataMakerRec.h"
 #include "AliTRDgeometry.h"
@@ -367,7 +368,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[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
@@ -454,9 +455,9 @@ void AliTRDQADataMakerRec::MakeESDs(AliESDEvent * esd)
   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();
 
@@ -521,18 +522,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->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) {
-      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
@@ -659,6 +660,7 @@ void AliTRDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
   const Int_t kMCM = 16;
   //  const Int_t kADC = 22;
 
+       rawReader->Reset() ; 
   //AliTRDrawStreamBase::SetRawStreamVersion("TB");
   AliTRDrawStreamBase *raw = AliTRDrawStreamBase::GetRawStream(rawReader);
   AliDebug(2,Form("Stream version: %s", raw->IsA()->GetName()));