Adapt to Mateusz modifications
authorcblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 25 Jan 2008 16:12:47 +0000 (16:12 +0000)
committercblume <cblume@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 25 Jan 2008 16:12:47 +0000 (16:12 +0000)
TRD/AliTRDCalibPadStatus.cxx
TRD/AliTRDCalibPadStatus.h
TRD/TRDPEDESTALda.cxx

index b012f4f..7ad6608 100644 (file)
@@ -75,7 +75,7 @@
 //header file
 #include "AliLog.h"
 #include "AliTRDCalibPadStatus.h"
-#include "AliTRDrawStreamTB.h"
+#include "AliTRDrawStreamBase.h"
 #include "AliTRDgeometry.h"
 #include "AliTRDCommonParam.h"
 #include "./Cal/AliTRDCalROC.h"
@@ -210,7 +210,7 @@ Int_t AliTRDCalibPadStatus::UpdateHisto(const Int_t icdet, /*FOLD00*/
   return 0;
 }
 //_____________________________________________________________________
-Int_t AliTRDCalibPadStatus::ProcessEvent(AliTRDrawStreamTB *rawStream, Bool_t nocheck)
+Int_t AliTRDCalibPadStatus::ProcessEvent(AliTRDrawStreamBase *rawStream, Bool_t nocheck)
 {
   //
   // Event Processing loop - AliTRDRawStreamCosmic
@@ -322,12 +322,17 @@ Int_t AliTRDCalibPadStatus::ProcessEvent(AliRawReader *rawReader, Bool_t nocheck
   //  Event processing loop - AliRawReader
   //
 
-
-  AliTRDrawStreamTB rawStream(rawReader);
-
+  Int_t result;
+  
   rawReader->Select("TRD");
+  
+  AliTRDrawStreamBase *pstream = AliTRDrawStreamBase::GetRawStream(rawReader);
+  result = ProcessEvent(pstream, nocheck);
+
+  delete pstream;
 
-  return ProcessEvent(&rawStream, nocheck);
+  return result;
 }
 
 //_________________________________________________________________________
index 37cf10a..8c5b589 100644 (file)
@@ -20,7 +20,7 @@ class AliTRDCalDet;
 class AliTRDCalPad;
 class AliTRDCalROC;
 class AliTRDCalPadStatus;
-class AliTRDrawStreamTB;
+class AliTRDrawStreamBase;
 class AliTRDgeometry;
 
 struct eventHeaderStruct;
@@ -35,7 +35,7 @@ public:
 
   AliTRDCalibPadStatus& operator = (const  AliTRDCalibPadStatus &source);
 
-  Int_t ProcessEvent(AliTRDrawStreamTB *rawStream, Bool_t nocheck = kFALSE);
+  Int_t ProcessEvent(AliTRDrawStreamBase *rawStream, Bool_t nocheck = kFALSE);
   Int_t ProcessEvent(AliRawReader    *rawReader, Bool_t nocheck = kFALSE);
   Int_t ProcessEvent(eventHeaderStruct   *event, Bool_t nocheck = kFALSE);
 
index 5891bc5..1553463 100644 (file)
@@ -34,6 +34,7 @@ extern "C" {
 #include "AliRawReader.h"
 #include "AliRawReaderDate.h"
 #include "AliTRDrawStreamTB.h"
+#include "AliTRDrawStreamBase.h"
 #include "AliCDBManager.h"
 //
 // AliRoot TRD calib classes
@@ -135,7 +136,7 @@ int main(int argc, char **argv) {
        rawReader->Select("TRD");
        AliTRDrawStreamTB *trdRawStream = new AliTRDrawStreamTB((AliRawReader *)rawReader);
        //trdRawStream->Init();
-       if(!calipad.ProcessEvent(trdRawStream,(Bool_t)nevents_total)) passpadstatus = kFALSE;
+       if(!calipad.ProcessEvent((AliTRDrawStreamBase *)trdRawStream,(Bool_t)nevents_total)) passpadstatus = kFALSE;
        nevents++;
        delete trdRawStream;
        delete rawReader;