Using the event definition from aliroot and not from DATE event.h

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

diff --git a/PHOS/AliPHOSCalibrator.cxx b/PHOS/AliPHOSCalibrator.cxx
index 950dc9a113d1bcd801ea0f7d80778412fa4a46ab..a33b6a5e687d45666fb2f2fea16673c2ff4c31a9 100644 (file)
--- a/PHOS/AliPHOSCalibrator.cxx
+++ b/PHOS/AliPHOSCalibrator.cxx
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.12  2006/09/07 18:31:08  kharlov
+ * Effective c++ corrections (T.Pocheptsov)
+ *
  * Revision 1.11  2006/01/13 16:59:39  kharlov
  * Rename classes to read raw data 2004
  *
@@ -75,11 +78,7 @@
 #include "AliPHOSRawStream2004.h"
 #include "AliPHOSDigit.h"
 
-#ifdef ALI_DATE
-#include "event.h"
-#else
-#define PHYSICS_EVENT 7
-#endif
+#include "AliRawEventHeaderBase.h"
 
 ClassImp(AliPHOSCalibrator)
 
@@ -339,7 +338,7 @@ void AliPHOSCalibrator::ScanPedestals(Option_t * option )
     //Scan all event in file
     while(rawReader->NextEvent()){
       //Is it PHYSICAL event
-      if(rawReader->GetType() == PHYSICS_EVENT){
+      if(rawReader->GetType() == AliRawEventHeaderBase::kPhysicsEvent){
        nevents++ ;
        if(rawStream->ReadDigits(digits)){
          if(rawStream->IsPEDevent()){
@@ -462,7 +461,7 @@ void AliPHOSCalibrator::ScanGains(Option_t * option)
     //Scan all event in file
     while(rawReader->NextEvent()){
       //Is it PHYSICAL event
-      if(rawReader->GetType() == PHYSICS_EVENT){
+      if(rawReader->GetType() == AliRawEventHeaderBase::kPhysicsEvent){
        if(rawStream->ReadDigits(digits)){
          //Test trigger
          if(rawStream->IsNELevent() || rawStream->IsWELevent()){