-correct order of classes

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

diff --git a/RAW/alirawdump_main.cxx b/RAW/alirawdump_main.cxx
index 59c3f3f3c70c84901bf0be0b3c2bf9508bea339a..3683d27496f15267224ae0d191082b400b5612d3 100644 (file)
--- a/RAW/alirawdump_main.cxx
+++ b/RAW/alirawdump_main.cxx
@@ -21,9 +21,9 @@
 #include <TTree.h>
 #include <TGrid.h>
 
-#include "AliRawEvent.h"
+#include "AliRawVEvent.h"
 #include "AliRawEventHeaderBase.h"
-#include "AliRawEquipment.h"
+#include "AliRawVEquipment.h"
 #include "AliRawEquipmentHeader.h"
 #include "AliRawDataHeader.h"
 #include "AliRawData.h"
@@ -31,6 +31,9 @@
 
 #include <Riostream.h>
 
+using std::cout;
+using std::endl;
+
 static Int_t miniEventIDOffset[AliDAQ::kNDetectors] = {3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565,3565};
 static Bool_t detTriggerClasses[AliDAQ::kNDetectors] = {1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1};
 
@@ -104,7 +107,7 @@ static bool CheckCDH(AliRawDataHeader *cdhRef,AliRawDataHeader *cdh)
 }
 
 //______________________________________________________________________________
-static bool DumpEvent(const char *progname, AliRawEvent *rawEvent)
+static bool DumpEvent(const char *progname, AliRawVEvent *rawEvent)
 {
   // Dumps and checks one
   // raw-data event
@@ -121,13 +124,13 @@ static bool DumpEvent(const char *progname, AliRawEvent *rawEvent)
   AliRawDataHeader *cdhRef = NULL;
 
   for(Int_t iSubEvent=0; iSubEvent < rawEvent->GetNSubEvents(); iSubEvent++) {
-    AliRawEvent *rawSubEvent = rawEvent->GetSubEvent(iSubEvent);
+    AliRawVEvent *rawSubEvent = rawEvent->GetSubEvent(iSubEvent);
     AliRawEventHeaderBase *rawSubEventHeader = rawSubEvent->GetHeader();
     cout << "    *********** Sub-event header ***********" << endl;
     rawSubEventHeader->Print("  ");
 
     for(Int_t iEquipment=0; iEquipment < rawSubEvent->GetNEquipments(); iEquipment++) {
-      AliRawEquipment *rawEquip = rawSubEvent->GetEquipment(iEquipment);
+      AliRawVEquipment *rawEquip = rawSubEvent->GetEquipment(iEquipment);
       AliRawEquipmentHeader *rawEquipHeader = rawEquip->GetEquipmentHeader();
       cout << "      *********** Equipment event header ***********" << endl;
       rawEquipHeader->Print("    ");
@@ -137,6 +140,9 @@ static bool DumpEvent(const char *progname, AliRawEvent *rawEvent)
 
       Int_t ddlID;
       Int_t detID = AliDAQ::DetectorIDFromDdlID(rawEquipHeader->GetId(),ddlID);
+      if (detID < 0) {
+       return false;
+      }
       Int_t idOffset = cdh->GetMiniEventID() - cdh->GetEventID1();
       if (idOffset < 0) idOffset += 3564;
       if (miniEventIDOffset[detID] == 3565) {
@@ -221,7 +227,7 @@ int main(int argc, char **argv)
     return 1;
   }
 
-  AliRawEvent *rawEvent=NULL;
+  AliRawVEvent *rawEvent=NULL;
  
   rawTree->SetBranchAddress("rawevent", &rawEvent);
 
@@ -234,13 +240,16 @@ int main(int argc, char **argv)
   cout << "*******************************************" << endl;
 
   for(Int_t iEvent=0; iEvent < nEvents; iEvent++) {
-    rawEvent=new AliRawEvent;
+    //    rawEvent=NULL;
     rawTree->GetEntry(iEvent);
     cout << "  *********** Event " << iEvent << " *******" << endl;
     DumpEvent(argv[0],rawEvent);
-    delete rawEvent;
+    //    delete rawEvent;
+    rawEvent->Clear();
   }
 
+  delete rawEvent;
+
   cout << "*******************************************" << endl;
   cout << "EOF" << endl;
   cout << "*******************************************" << endl;