Corrections for next event switch in case of raw data (B.Polichtchouk)
authorkharlov <kharlov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 7 Nov 2006 16:49:51 +0000 (16:49 +0000)
committerkharlov <kharlov@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 7 Nov 2006 16:49:51 +0000 (16:49 +0000)
PHOS/AliPHOSClusterizerv1.cxx
PHOS/AliPHOSGetter.cxx

index c9ac3c0..e6fc516 100644 (file)
@@ -18,6 +18,9 @@
 /* History of cvs commits:
  *
  * $Log$
+ * Revision 1.98  2006/10/27 17:14:27  kharlov
+ * Introduce AliDebug and AliLog (B.Polichtchouk)
+ *
  * Revision 1.97  2006/08/29 11:41:19  kharlov
  * Missing implementation of ctors and = operator are added
  *
 
 // --- AliRoot header files ---
 #include "AliLog.h"
+#include "AliRunLoader.h"
 #include "AliPHOSGetter.h"
 #include "AliPHOSGeometry.h" 
 #include "AliPHOSClusterizerv1.h"
@@ -281,6 +285,8 @@ void AliPHOSClusterizerv1::Exec(Option_t *option)
     if (fRawReader == 0)
       gime->Event(ievent    ,"D"); // Read digits from simulated data
     else {
+      AliRunLoader * rl = AliRunLoader::GetRunLoader(gime->PhosLoader()->GetTitle());
+      rl->GetEvent(ievent);
       gime->Event(fRawReader,"W",fIsOldRCUFormat); // Read digits from raw data
     }
     fNumberOfEmcClusters  = fNumberOfCpvClusters  = 0 ;
index cc7a6c5..50091c3 100644 (file)
@@ -402,13 +402,9 @@ void AliPHOSGetter::Event(AliRawReader *rawReader, const char* opt, Bool_t isOld
   // Reads the raw event from rawReader
   // isOldRCUFormat defines whenever to assume
   // the old RCU format or not
-
-  AliRunLoader * rl = AliRunLoader::GetRunLoader(PhosLoader()->GetTitle());
   
   if( strstr(opt,"W")  ){
-    rawReader->NextEvent(); 
-    Int_t iEvent = rl->GetEventNumber();
-    rl->GetEvent(iEvent);
+    rawReader->NextEvent();
     ReadRaw(rawReader,isOldRCUFormat) ;
   }