X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=RAW%2Falirawdump_main.cxx;h=e5fe231e8ac4a0aeac288fd94cf5c087bfec04e8;hb=c9141a7cb8709b1ed4481c0dfaf30bbf0987aa86;hp=aeb437cd2c2c7c73757a6121b666f252f9a80f05;hpb=35904953766a1bc04b7ed83e49fa34a6b442374c;p=u%2Fmrichter%2FAliRoot.git

diff --git a/RAW/alirawdump_main.cxx b/RAW/alirawdump_main.cxx
index aeb437cd2c2..e5fe231e8ac 100644
--- 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"
@@ -104,7 +104,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 +121,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("    ");
@@ -168,10 +168,6 @@ static bool DumpEvent(const char *progname, AliRawEvent *rawEvent)
 	// TPC L1 trigger message is shifted by 2 bits??
 	UShort_t l1Message = cdh->GetL1TriggerMessage();
 	UShort_t l1MessageRef = cdhRef->GetL1TriggerMessage();
-	if (detID == 3) {
-	  l1Message = ((cdh->fWord2 >> 16) & 0x1F);
-	  l1MessageRef = cdhRef->GetL1TriggerMessage() & 0x1F;
-	}
 
 	if (l1Message != l1MessageRef)
 	  cout << "ERROR: CDH mismatch detected in L1TriggerMessage for detector " << AliDAQ::DetectorName(detID) << ": " << (Int_t)l1MessageRef << " ( " << (Int_t)cdhRef->GetL1TriggerMessage() << " ) " << " != " << (Int_t)l1Message << " ( " << (Int_t)cdh->GetL1TriggerMessage() << " )" << endl;
@@ -225,7 +221,7 @@ int main(int argc, char **argv)
     return 1;
   }
 
-  AliRawEvent *rawEvent=NULL;
+  AliRawVEvent *rawEvent=NULL;
  
   rawTree->SetBranchAddress("rawevent", &rawEvent);
 
@@ -238,7 +234,7 @@ 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);