Technical fix: run the vertex finder even in case the local reco for ITS is off....

[u/mrichter/AliRoot.git] / RAW / AliRawReaderRoot.cxx

diff --git a/RAW/AliRawReaderRoot.cxx b/RAW/AliRawReaderRoot.cxx
index 4fad681cc78fed643c30c211e6918991248f7fc1..4c39e3298419f5226e7354c652dd94ebb01ed062 100644 (file)
--- a/RAW/AliRawReaderRoot.cxx
+++ b/RAW/AliRawReaderRoot.cxx
@@ -21,7 +21,7 @@
 ///
 /// The root file is expected to contain a tree of name "RAW" with
 /// a branch of name "rawevent" which contains objects of type
-/// AliRawEvent.
+/// AliRawVEvent.
 /// 
 /// The file name and the event number are arguments of the constructor
 /// of AliRawReaderRoot.
@@ -31,9 +31,9 @@
 #include <TFile.h>
 #include <TTree.h>
 #include "AliRawReaderRoot.h"
-#include "AliRawEvent.h"
+#include "AliRawVEvent.h"
 #include "AliRawEventHeaderBase.h"
-#include "AliRawEquipment.h"
+#include "AliRawVEquipment.h"
 #include "AliRawEquipmentHeader.h"
 #include "AliRawData.h"
 
@@ -45,6 +45,7 @@ AliRawReaderRoot::AliRawReaderRoot() :
   fBranch(NULL),
   fEventIndex(-1),
   fEvent(NULL),
+  fEventHeader(NULL),
   fSubEventIndex(0),
   fSubEvent(NULL),
   fEquipmentIndex(0),
@@ -62,6 +63,7 @@ AliRawReaderRoot::AliRawReaderRoot(const char* fileName, Int_t eventNumber) :
   fBranch(NULL),
   fEventIndex(eventNumber),
   fEvent(NULL),
+  fEventHeader(NULL),
   fSubEventIndex(0),
   fSubEvent(NULL),
   fEquipmentIndex(0),
@@ -78,34 +80,39 @@ AliRawReaderRoot::AliRawReaderRoot(const char* fileName, Int_t eventNumber) :
   dir->cd();
   if (!fFile || !fFile->IsOpen()) {
     Error("AliRawReaderRoot", "could not open file %s", fileName);
+    fIsValid = kFALSE;
     return;
   }
   TTree* tree = (TTree*) fFile->Get("RAW");
   if (!tree) {
     Error("AliRawReaderRoot", "no raw data tree found");
+    fIsValid = kFALSE;
     return;
   }
   fBranch = tree->GetBranch("rawevent");
   if (!fBranch) {
     Error("AliRawReaderRoot", "no raw data branch found");
+    fIsValid = kFALSE;
     return;
   }
 
-  fEvent = new AliRawEvent;
   fBranch->SetAddress(&fEvent);
   if (fEventIndex >= 0) {
     if (fBranch->GetEntry(fEventIndex) <= 0) {
       Error("AliRawReaderRoot", "no event with number %d found", fEventIndex);
+      fIsValid = kFALSE;
       return;
     }
+    fEventHeader = fEvent->GetHeader();
   }
 }
 
-AliRawReaderRoot::AliRawReaderRoot(AliRawEvent* event) :
+AliRawReaderRoot::AliRawReaderRoot(AliRawVEvent* event) :
   fFile(NULL),
   fBranch(NULL),
   fEventIndex(-1),
   fEvent(event),
+  fEventHeader(event->GetHeader()),
   fSubEventIndex(0),
   fSubEvent(NULL),
   fEquipmentIndex(0),
@@ -115,7 +122,7 @@ AliRawReaderRoot::AliRawReaderRoot(AliRawEvent* event) :
   fEnd(NULL)
 {
 // create an object to read digits from the given raw event
-
+  if (!fEvent) fIsValid = kFALSE;
 }
 
 AliRawReaderRoot::AliRawReaderRoot(const AliRawReaderRoot& rawReader) :
@@ -124,6 +131,7 @@ AliRawReaderRoot::AliRawReaderRoot(const AliRawReaderRoot& rawReader) :
   fBranch(NULL),
   fEventIndex(rawReader.fEventIndex),
   fEvent(NULL),
+  fEventHeader(NULL),
   fSubEventIndex(rawReader.fSubEventIndex),
   fSubEvent(NULL),
   fEquipmentIndex(rawReader.fEquipmentIndex),
@@ -141,30 +149,35 @@ AliRawReaderRoot::AliRawReaderRoot(const AliRawReaderRoot& rawReader) :
     if (!fFile || !fFile->IsOpen()) {
       Error("AliRawReaderRoot", "could not open file %s", 
            rawReader.fFile->GetName());
+      fIsValid = kFALSE;
       return;
     }
     TTree* tree = (TTree*) fFile->Get("RAW");
     if (!tree) {
       Error("AliRawReaderRoot", "no raw data tree found");
+      fIsValid = kFALSE;
       return;
     }
     fBranch = tree->GetBranch("rawevent");
     if (!fBranch) {
       Error("AliRawReaderRoot", "no raw data branch found");
+      fIsValid = kFALSE;
       return;
     }
 
-    fEvent = new AliRawEvent;
     fBranch->SetAddress(&fEvent);
     if (fEventIndex >= 0) {
       if (fBranch->GetEntry(fEventIndex) <= 0) {
        Error("AliRawReaderRoot", "no event with number %d found", 
              fEventIndex);
+       fIsValid = kFALSE;
        return;
       }
+      fEventHeader = fEvent->GetHeader();
     }
   } else {
     fEvent = rawReader.fEvent;
+    fEventHeader = rawReader.fEventHeader;
   }
 
   if (fSubEventIndex > 0) {
@@ -206,56 +219,55 @@ const AliRawEventHeaderBase* AliRawReaderRoot::GetEventHeader() const
 {
   // Get the even header
   // Return NULL in case of failure
-  if (!fEvent) return NULL;
-  return fEvent->GetHeader();
+  return fEventHeader;
 }
 
 UInt_t AliRawReaderRoot::GetType() const
 {
 // get the type from the event header
 
-  if (!fEvent) return 0;
-  return fEvent->GetHeader()->Get("Type");
+  if (!fEventHeader) return 0;
+  return fEventHeader->Get("Type");
 }
 
 UInt_t AliRawReaderRoot::GetRunNumber() const
 {
 // get the run number from the event header
 
-  if (!fEvent) return 0;
-  return fEvent->GetHeader()->Get("RunNb");
+  if (!fEventHeader) return 0;
+  return fEventHeader->Get("RunNb");
 }
 
 const UInt_t* AliRawReaderRoot::GetEventId() const
 {
 // get the event id from the event header
 
-  if (!fEvent) return NULL;
-  return fEvent->GetHeader()->GetP("Id");
+  if (!fEventHeader) return NULL;
+  return fEventHeader->GetP("Id");
 }
 
 const UInt_t* AliRawReaderRoot::GetTriggerPattern() const
 {
 // get the trigger pattern from the event header
 
-  if (!fEvent) return NULL;
-  return fEvent->GetHeader()->GetP("TriggerPattern");
+  if (!fEventHeader) return NULL;
+  return fEventHeader->GetP("TriggerPattern");
 }
 
 const UInt_t* AliRawReaderRoot::GetDetectorPattern() const
 {
 // get the detector pattern from the event header
 
-  if (!fEvent) return NULL;
-  return fEvent->GetHeader()->GetP("DetectorPattern");
+  if (!fEventHeader) return NULL;
+  return fEventHeader->GetP("DetectorPattern");
 }
 
 const UInt_t* AliRawReaderRoot::GetAttributes() const
 {
 // get the type attributes from the event header
 
-  if (!fEvent) return NULL;
-  return fEvent->GetHeader()->GetP("TypeAttribute");
+  if (!fEventHeader) return NULL;
+  return fEventHeader->GetP("TypeAttribute");
 }
 
 const UInt_t* AliRawReaderRoot::GetSubEventAttributes() const
@@ -278,14 +290,14 @@ UInt_t AliRawReaderRoot::GetGDCId() const
 {
 // get the GDC Id from the event header
 
-  if (!fEvent) return 0;
-  return fEvent->GetHeader()->Get("GdcId");
+  if (!fEventHeader) return 0;
+  return fEventHeader->Get("GdcId");
 }
 
 UInt_t AliRawReaderRoot::GetTimestamp() const
 {
-  if (!fEvent) return 0;
-  return fEvent->GetHeader()->Get("Timestamp");
+  if (!fEventHeader) return 0;
+  return fEventHeader->Get("Timestamp");
 }
 
 Int_t AliRawReaderRoot::GetEquipmentSize() const
@@ -390,6 +402,10 @@ Bool_t AliRawReaderRoot::ReadHeader()
 
       // get the next equipment and raw data
       fCount = 0;
+      if (fEquipmentIndex >= fSubEvent->GetNEquipments()) {
+       fEquipment = NULL;
+       continue;
+      }
       fEquipment = fSubEvent->GetEquipment(fEquipmentIndex++);
       if (!fEquipment) continue;
       if (!IsSelected()) {
@@ -518,10 +534,12 @@ Bool_t AliRawReaderRoot::NextEvent()
 
   do {
     delete fEvent;
-    fEvent = new AliRawEvent;
+    fEvent = NULL;
+    fEventHeader = NULL;
     fBranch->SetAddress(&fEvent);
     if (fBranch->GetEntry(fEventIndex+1) <= 0)
       return kFALSE;
+    fEventHeader = fEvent->GetHeader();
     fEventIndex++;
   } while (!IsEventSelected());
   fEventNumber++;
@@ -536,7 +554,8 @@ Bool_t AliRawReaderRoot::RewindEvents()
 
   fEventIndex = -1;
   delete fEvent;
-  fEvent = new AliRawEvent;
+  fEvent = NULL;
+  fEventHeader = NULL;
   fBranch->SetAddress(&fEvent);
   fEventNumber = -1;
   return Reset();
@@ -551,24 +570,36 @@ Bool_t  AliRawReaderRoot::GotoEvent(Int_t event)
   if (!fBranch) return kFALSE;
 
   delete fEvent;
-  fEvent = new AliRawEvent;
+  fEvent = NULL;
+  fEventHeader = NULL;
   fBranch->SetAddress(&fEvent);
   if (fBranch->GetEntry(event) <= 0)
     return kFALSE;
+  fEventHeader = fEvent->GetHeader();
   fEventIndex = event;
   fEventNumber++;
   return Reset();
 }
 
+Int_t AliRawReaderRoot::GetNumberOfEvents() const
+{
+  // Get the total number of events in
+  // the raw-data tree
+
+  if (!fBranch) return -1;
+
+  return fBranch->GetEntries();
+}
+
 Int_t AliRawReaderRoot::CheckData() const
 {
 // check the consistency of the data
 
   if (!fEvent) return 0;
 
-  AliRawEvent* subEvent = NULL;
+  AliRawVEvent* subEvent = NULL;
   Int_t subEventIndex = 0;
-  AliRawEquipment* equipment = NULL;
+  AliRawVEquipment* equipment = NULL;
   Int_t equipmentIndex = 0;
   UChar_t* position = 0;
   UChar_t* end = 0;
@@ -592,6 +623,10 @@ Int_t AliRawReaderRoot::CheckData() const
     }
 
     // get the next equipment and raw data
+    if (equipmentIndex >= subEvent->GetNEquipments()) {
+      equipment = NULL;
+      continue;
+    }
     equipment = subEvent->GetEquipment(equipmentIndex++);
     if (!equipment) continue;
     AliRawData* rawData = equipment->GetRawData();