Reset rawReader in MakeRaws (Yves)

diff --git a/EMCAL/AliEMCALQADataMakerRec.cxx b/EMCAL/AliEMCALQADataMakerRec.cxx
index 58c40314bc7088966eba7ffcc62533fd980db613..537cf94efc3be9d606479e4f63152148b7f6b5e2 100644 (file)
--- a/EMCAL/AliEMCALQADataMakerRec.cxx
+++ b/EMCAL/AliEMCALQADataMakerRec.cxx
@@ -40,6 +40,7 @@ Authors:  J.Klay (Cal Poly) May 2008
 #include "AliEMCALRawUtils.h"
 #include "AliEMCALReconstructor.h"
 #include "AliEMCALRecParam.h"
+#include "AliRawReader.h"
 
 ClassImp(AliEMCALQADataMakerRec)
            
@@ -186,7 +187,7 @@ void AliEMCALQADataMakerRec::MakeESDs(AliESDEvent * esd)
 }
 
 //____________________________________________________________________________
-void AliEMCALQADataMakerRec::MakeRaws(AliRawReader* /* rawReader */)
+void AliEMCALQADataMakerRec::MakeRaws(AliRawReader* rawReader)
 {
   //Fill prepared histograms with Raw digit properties
 
@@ -198,6 +199,7 @@ void AliEMCALQADataMakerRec::MakeRaws(AliRawReader* /* rawReader */)
   //emcal raw data method, but this doesn't seem to be allowed in
   //AliQADataMakerRec.h
 
+       rawReader->Reset() ;
 }
 
 //____________________________________________________________________________

diff --git a/FMD/AliFMDQADataMakerRec.cxx b/FMD/AliFMDQADataMakerRec.cxx
index 7d8226dc5d39dcda8e7f857de5d0825d15cebe8c..64d379c707ffb4e7d8ec53dedfb7f89c55ca3a28 100644 (file)
--- a/FMD/AliFMDQADataMakerRec.cxx
+++ b/FMD/AliFMDQADataMakerRec.cxx
@@ -211,18 +211,14 @@ void AliFMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
   TClonesArray* digitsAddress = &fDigitsArray;
   
   rawReader->Reset();
-  
-  while(rawReader->NextEvent()) {
-    
-    digitsAddress->Clear();
-    fmdReader.ReadAdcs(digitsAddress);
-    for(Int_t i=0;i<digitsAddress->GetEntriesFast();i++) {
-      //Raw ADC counts
-      AliFMDDigit* digit = static_cast<AliFMDDigit*>(digitsAddress->At(i));
-      GetRawsData(0)->Fill(digit->Counts());
-    }
-  }
-  
+               
+       digitsAddress->Clear();
+       fmdReader.ReadAdcs(digitsAddress);
+       for(Int_t i=0;i<digitsAddress->GetEntriesFast();i++) {
+               //Raw ADC counts
+               AliFMDDigit* digit = static_cast<AliFMDDigit*>(digitsAddress->At(i));
+               GetRawsData(0)->Fill(digit->Counts());
+       }
 }
 
 //_____________________________________________________________________

diff --git a/HMPID/AliHMPIDQADataMakerRec.cxx b/HMPID/AliHMPIDQADataMakerRec.cxx
index a2b26c251f4afd694b98185efd0e49898c03f318..45189a2f432a9e7f68d0afaa868e8ee84d70d224 100644 (file)
--- a/HMPID/AliHMPIDQADataMakerRec.cxx
+++ b/HMPID/AliHMPIDQADataMakerRec.cxx
@@ -171,7 +171,8 @@ void AliHMPIDQADataMakerRec::MakeRaws(AliRawReader *rawReader)
 //
 // Filling Raws QA histos
 //
-    AliHMPIDRawStream stream(rawReader);
+         rawReader->Reset() ; 
+               AliHMPIDRawStream stream(rawReader);
 
     fEvtRaw++;
 

diff --git a/PMD/AliPMDQADataMakerRec.cxx b/PMD/AliPMDQADataMakerRec.cxx
index 61422e7aa2d66c14480f3c587ca856e8b476fb92..4f2300c671b624500fe3167ac5fc36c976d75dbb 100644 (file)
--- a/PMD/AliPMDQADataMakerRec.cxx
+++ b/PMD/AliPMDQADataMakerRec.cxx
@@ -40,6 +40,9 @@
 #include "AliPMDddldata.h"
 #include "AliPMDUtility.h"
 #include "AliESDPmdTrack.h"
+#include "AliRawReader.h"
+
+//#include "AliPMDRecoParam.h"
 
 ClassImp(AliPMDQADataMakerRec)
            
@@ -372,7 +375,8 @@ void AliPMDQADataMakerRec::MakeRaws(AliRawReader* rawReader)
 {
     //Fill prepared histograms with Raw digit properties
 
-    TObjArray *pmdddlcont = 0x0;
+         rawReader->Reset() ;
+         TObjArray *pmdddlcont = 0x0;
     pmdddlcont = new TObjArray();
     AliPMDRawStream stream(rawReader);
     

diff --git a/T0/AliT0QADataMakerRec.cxx b/T0/AliT0QADataMakerRec.cxx
index 42b9b32b4363e3923db17a654e483c382fa90055..f3f8d5550e18cb34025224a05cd2812714b70348 100644 (file)
--- a/T0/AliT0QADataMakerRec.cxx
+++ b/T0/AliT0QADataMakerRec.cxx
@@ -237,6 +237,7 @@ void AliT0QADataMakerRec::InitESDs()
 //____________________________________________________________________________
 void AliT0QADataMakerRec::MakeRaws( AliRawReader* rawReader)
 {
+       rawReader->Reset() ; 
   //fills QA histos for RAW
   Int_t shift=0;
   AliT0RawReader *start = new AliT0RawReader(rawReader);

diff --git a/TPC/AliTPCQADataMakerRec.cxx b/TPC/AliTPCQADataMakerRec.cxx
index 14ea46573d9afabe33178bf8d4801d1111a06d30..55b31340ee5ee026e212a26cf777b476ff792887 100644 (file)
--- a/TPC/AliTPCQADataMakerRec.cxx
+++ b/TPC/AliTPCQADataMakerRec.cxx
@@ -393,6 +393,7 @@ void AliTPCQADataMakerRec::MakeRaws(AliRawReader* rawReader)
   // To make QA for the RAW data we use the TPC Calibration framework 
   // to handle the data and then in the end extract the data
   //
+       rawReader->Reset() ; 
   fTPCdataQA->ProcessEvent(rawReader);  
 }
 

diff --git a/TRD/AliTRDQADataMakerRec.cxx b/TRD/AliTRDQADataMakerRec.cxx
index d49a257283757c0737f541b665484c8024d1752b..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"
@@ -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()));

diff --git a/VZERO/AliVZEROQADataMakerRec.cxx b/VZERO/AliVZEROQADataMakerRec.cxx
index ac5e4a7ccb662909d99b26957e68a6f39225c626..819dd34a335181427b91031749d25ada81d41e52 100644 (file)
--- a/VZERO/AliVZEROQADataMakerRec.cxx
+++ b/VZERO/AliVZEROQADataMakerRec.cxx
@@ -237,7 +237,8 @@ void AliVZEROQADataMakerRec::MakeESDs(AliESDEvent * esd)
  {
   //Fill histograms with Raws, computes average ADC values dynamically (pedestal subtracted)
                   
-  AliVZERORawStream* rawStream  = new AliVZERORawStream(rawReader); 
+       rawReader->Reset() ; 
+       AliVZERORawStream* rawStream  = new AliVZERORawStream(rawReader); 
   rawStream->Next();
   
   Float_t ChargeEoI, Threshold;  // for pedestal subtraction 

diff --git a/ZDC/AliZDCQADataMakerRec.cxx b/ZDC/AliZDCQADataMakerRec.cxx
index 73cdf3dc4dbfdb4dc1a1b112a2811dc2f3a2cc06..d7af206de3cdccba2202ee63d16da3cee455b008 100644 (file)
--- a/ZDC/AliZDCQADataMakerRec.cxx
+++ b/ZDC/AliZDCQADataMakerRec.cxx
@@ -33,6 +33,7 @@
 // --- AliRoot header files ---
 #include "AliLog.h"
 #include "AliQAChecker.h"
+#include "AliRawReader.h"
 #include "AliZDCQADataMakerRec.h"
 #include "AliZDCRawStream.h"
 #include "AliESDZDC.h"
@@ -201,6 +202,7 @@ void AliZDCQADataMakerRec::MakeRaws(AliRawReader *rawReader)
 {
   // Filling Raws QA histos
   //
+       rawReader->Reset() ; 
   Float_t sum_ZNC=0., sum_ZNA=0., sum_ZPC=0., sum_ZPA=0.;
   Float_t sumQ_ZNC=0., sumQ_ZNA=0., sumQ_ZPC=0., sumQ_ZPA=0.;
   //Float_t sum_ZNC_lg=0., sum_ZNA_lg=0., sum_ZPC_lg=0., sum_ZPA_lg=0.;