Moving the Decode methods (which are used by 2 classes now) (Laurent)

[u/mrichter/AliRoot.git] / PHOS / AliPHOSOnlineMonitor.cxx

diff --git a/PHOS/AliPHOSOnlineMonitor.cxx b/PHOS/AliPHOSOnlineMonitor.cxx
index cb24b8ba52ee7fe90660451692eb66332d8e3b84..23e0305895ff47b9e15b8f56f24052b446986084 100644 (file)
--- a/PHOS/AliPHOSOnlineMonitor.cxx
+++ b/PHOS/AliPHOSOnlineMonitor.cxx
@@ -55,8 +55,9 @@
 #include "AliPHOSOnlineMonitor.h"
 #include "AliPHOSConTableDB.h"
 #include "AliPHOSGeometry.h"
-#include "AliPHOSRawReaderDate.h"
-#include "AliPHOSRawStream.h"
+#include "AliRawReaderDateV3.h"
+#include "AliRawEventHeaderBase.h"
+#include "AliPHOSRawStream2004.h"
 #include "AliPHOSDigit.h"
 #include "AliPHOSGetterLight.h"  
 #include "AliPHOSClusterizerv1.h"  
@@ -69,9 +70,19 @@ ClassImp(AliPHOSOnlineMonitor)
 
 
 //____________________________________________________________________________ 
-AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(): TDialogCanvas("PHOS","PHOS",150,300)
+AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(): 
+  TDialogCanvas("PHOS","PHOS",150,300),
+  fScanPed(kFALSE),
+  fScanSig(kFALSE),
+  fReconstruct(kFALSE),
+  fNevents(0),
+  fNUpdate(1000),
+  fCanvasList(new TList),
+  fHistosList(new TList),
+  fInputFile(),
+  fGeom(0),
+  fcdb(0)
 {
-  
   MakeButtons() ;
   Modified(kTRUE);
   Update();
@@ -84,23 +95,22 @@ AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(): TDialogCanvas("PHOS","PHOS",150,30
   fRefObject = this;
   fRefPad    = (TPad*)gROOT->GetSelectedPad();
 
-  fScanPed = 0 ;
-  fScanSig = 0; 
-  fReconstruct = 0 ;
-
-  //Prepare list of canvas with histograms
-  fCanvasList = new TList() ;
-  fHistosList = new TList() ;
-
-  fcdb = 0 ;
   fGeom = AliPHOSGeometry::GetInstance("IHEP","") ;
-  fNUpdate = 1000 ;
-
 }
 //____________________________________________________________________________ 
-AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(const char * inputfile): TDialogCanvas("PHOS","PHOS",150,300)
+AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(const char * inputfile): 
+  TDialogCanvas("PHOS","PHOS",150,300),
+  fScanPed(kFALSE),
+  fScanSig(kFALSE),
+  fReconstruct(kFALSE),
+  fNevents(0),
+  fNUpdate(1000),
+  fCanvasList(new TList),
+  fHistosList(new TList),
+  fInputFile(inputfile),
+  fGeom(0),
+  fcdb(0)
 {
-
   MakeButtons() ;
   Modified(kTRUE);
   Update();
@@ -113,22 +123,35 @@ AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(const char * inputfile): TDialogCanva
   fRefObject = this;
   fRefPad    = (TPad*)gROOT->GetSelectedPad();
 
-  fScanPed = 0 ;
-  fScanSig = 0; 
-  fReconstruct = 0 ;
-
-  //Prepare list of canvas with histograms
-  fCanvasList = new TList() ;
-  fHistosList = new TList() ;
-
-  fInputFile = inputfile ;
   fGeom = AliPHOSGeometry::GetInstance("IHEP","") ;
-  fcdb = 0 ;
-  fNUpdate = 1000 ;
+}
 
+//____________________________________________________________________________ 
+AliPHOSOnlineMonitor::AliPHOSOnlineMonitor(const AliPHOSOnlineMonitor & /*rhs*/):
+  TDialogCanvas(),
+  fScanPed(kFALSE),
+  fScanSig(kFALSE),
+  fReconstruct(kFALSE),
+  fNevents(0),
+  fNUpdate(0),
+  fCanvasList(0),
+  fHistosList(0),
+  fInputFile(),
+  fGeom(0),
+  fcdb(0)
+{
+  Fatal("AliPHOSOnlineMonitor", "not implemented");
 }
+
+//____________________________________________________________________________ 
+AliPHOSOnlineMonitor & AliPHOSOnlineMonitor::operator = (const AliPHOSOnlineMonitor &)
+{
+  Fatal("operator = ", "not implemented");
+  return *this;
+}
+
 //____________________________________________________________________________ 
-  AliPHOSOnlineMonitor::~AliPHOSOnlineMonitor()
+AliPHOSOnlineMonitor::~AliPHOSOnlineMonitor()
 {
   //Obvious, but unevoidable comment for destructor: cleans up everething.
   TIter nextCanvas(fCanvasList);
@@ -541,13 +564,13 @@ void  AliPHOSOnlineMonitor::ScanTrigger(Int_t trig){
   TH1D * h = (TH1D*)gROOT->FindObjectAny("hTriggers");
   if(!h) return ;
   switch(trig){
-  case AliPHOSRawStream::kLED : h->Fill("LED",1.) ; break ;
-  case AliPHOSRawStream::kPUL : h->Fill("PUL",1.) ; break ;
-  case AliPHOSRawStream::kPED : h->Fill("PED",1.) ; break ;
-  case AliPHOSRawStream::kNEL : h->Fill("NEL",1.) ; break ;
-  case AliPHOSRawStream::kWEL : h->Fill("WEL",1.) ; break ;
-  case AliPHOSRawStream::kSOB : h->Fill("SOB",1.) ; break ;
-  case AliPHOSRawStream::kEOB : h->Fill("EOB",1.) ; break ;
+  case AliPHOSRawStream2004::kLED : h->Fill("LED",1.) ; break ;
+  case AliPHOSRawStream2004::kPUL : h->Fill("PUL",1.) ; break ;
+  case AliPHOSRawStream2004::kPED : h->Fill("PED",1.) ; break ;
+  case AliPHOSRawStream2004::kNEL : h->Fill("NEL",1.) ; break ;
+  case AliPHOSRawStream2004::kWEL : h->Fill("WEL",1.) ; break ;
+  case AliPHOSRawStream2004::kSOB : h->Fill("SOB",1.) ; break ;
+  case AliPHOSRawStream2004::kEOB : h->Fill("EOB",1.) ; break ;
   default : h->Fill("wrong",1.) ;
   }
 }
@@ -592,8 +615,9 @@ void  AliPHOSOnlineMonitor::Go(){
   }
   
   //Now open data file
-  AliPHOSRawReaderDate *rawReader = new AliPHOSRawReaderDate(fInputFile) ; 
-  AliPHOSRawStream     *rawStream = new AliPHOSRawStream(rawReader) ;
+  AliRawReaderDateV3 *rawReader = new AliRawReaderDateV3(fInputFile) ; 
+  rawReader->RequireHeader(kFALSE);
+  AliPHOSRawStream2004     *rawStream = new AliPHOSRawStream2004(rawReader) ;
   rawStream->SetConTableDB(fcdb) ;
   
   TClonesArray * digits = gime->Digits() ;
@@ -619,7 +643,7 @@ void  AliPHOSOnlineMonitor::Go(){
   printf("      ") ;
   while(rawReader->NextEvent()){
     //Is it PHYSICAL event
-    if(rawReader->GetType() == PHYSICS_EVENT){
+    if(rawReader->GetType() == AliRawEventHeaderBase::kPhysicsEvent){
       fNevents++ ;
       if(fNevents%100 ==0){
        printf("\b\b\b\b\b\b%6d",fNevents) ;