Removing static data members (TF1 objects) from AliRICHParam to make it working on...

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

diff --git a/PHOS/AliPHOSOnlineMonitor.cxx b/PHOS/AliPHOSOnlineMonitor.cxx
index cb24b8ba52ee7fe90660451692eb66332d8e3b84..1d87d1903f2e7254ebfbd2120b008fb1746bb700 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"  
@@ -541,13 +542,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 +593,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 +621,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) ;