ALIROOT-5420 Changes for CDH v3

diff --git a/EMCAL/AliEMCALTriggerRawDigitMaker.cxx b/EMCAL/AliEMCALTriggerRawDigitMaker.cxx
index 6f5ba738661c78721f5891382d3b841c4b0363b8..2804a3f3c3622c03b94a2408eea60a2f7ebf8a0e 100644 (file)
--- a/EMCAL/AliEMCALTriggerRawDigitMaker.cxx
+++ b/EMCAL/AliEMCALTriggerRawDigitMaker.cxx
@@ -39,7 +39,6 @@ Author: R. GUERNANE LPSC Grenoble CNRS/IN2P3
 #include "AliEMCALTriggerPatch.h"
 #include "AliLog.h"
 
-#include "AliRawDataHeader.h"
 #include "AliRawVEvent.h"
 #include "AliRawEventHeaderBase.h"
 #include "AliRawEvent.h"

diff --git a/HMPID/AliHMPIDDigit.cxx b/HMPID/AliHMPIDDigit.cxx
index 712a21798f4a31292cec0dee3c9cdaf87fcc3116..c922cfe60668f77ee5c2b5ac92742221b943b3ed 100644 (file)
--- a/HMPID/AliHMPIDDigit.cxx
+++ b/HMPID/AliHMPIDDigit.cxx
@@ -17,7 +17,6 @@
 #include <TClonesArray.h>     //WriteRaw() 
 #include <TBox.h>             //Draw() 
 #include <TPolyLine.h>        //Draw() 
-#include <AliRawDataHeader.h> //WriteRaw()
 #include "AliHMPIDParam.h"
 #include <AliDAQ.h>           //WriteRaw()
 #include "Riostream.h"        //WriteRaw()

diff --git a/MUON/AliMUONRawStreamTracker.cxx b/MUON/AliMUONRawStreamTracker.cxx
index 81b78dfdaca16b7a03ce4b28eb8896ea24c38eb8..f1c3154d9c433903a6191c846d22ba73fd937158 100644 (file)
--- a/MUON/AliMUONRawStreamTracker.cxx
+++ b/MUON/AliMUONRawStreamTracker.cxx
@@ -35,7 +35,6 @@
 
 #include "AliMUONLogger.h"
 #include "AliRawReader.h"
-#include "AliRawDataHeader.h"
 #include "AliDAQ.h"
 #include "AliLog.h"
 #include "AliMUONPayloadTracker.h"

diff --git a/MUON/AliMUONRawStreamTrackerHP.cxx b/MUON/AliMUONRawStreamTrackerHP.cxx
index 73fa28b13a529f9b9ff6fd3ff53833f51e8fbed6..fc6e5278a7f6c04b1eda93423469cf9048c9d1dc 100644 (file)
--- a/MUON/AliMUONRawStreamTrackerHP.cxx
+++ b/MUON/AliMUONRawStreamTrackerHP.cxx
@@ -715,7 +715,7 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                detail = Form(
                        "At byte %lu in DDL %d, event %d, iBlock %d, iDsp %d [DSP ID: %d (0x%X)],"
                        " iBus %d [bus patch ID: %d (0x%X)].",
-                       (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeader),
+                       (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeaderV3),
                        AliDAQ::DdlID("MUONTRK", fRawStream->GetDDL()),
                        fRawStream->GetReader()->GetEventIndex(),
                        int(fBlockCount)-1,
@@ -852,7 +852,7 @@ void AliMUONRawStreamTrackerHP::AliDecoderEventHandler::OnError(
                        message = Form(
                                "%s (At byte %lu)",
                                ErrorCodeToMessage(error),
-                               (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeader)
+                               (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeaderV3)
                        );
                        break;
                case kHighErrorDetail:

diff --git a/MUON/AliMUONRawStreamTrigger.cxx b/MUON/AliMUONRawStreamTrigger.cxx
index 171156e1e96ffe64d53baf6e72bf7c9707d0b22f..473719a43fccc3afbc254394167a75c376c811c6 100644 (file)
--- a/MUON/AliMUONRawStreamTrigger.cxx
+++ b/MUON/AliMUONRawStreamTrigger.cxx
@@ -232,7 +232,15 @@ Bool_t AliMUONRawStreamTrigger::GetNextDDL()
   
   Int_t totalDataWord  = GetReader()->GetDataSize(); // in bytes
   
-  Bool_t scalerEvent =  GetReader()->GetDataHeader()->GetL1TriggerMessage() & 0x1;
+  AliRawReader * reader = GetReader();
+  if (!reader) return kFALSE;
+
+  const AliRawDataHeader * cdh = reader->GetDataHeader();
+  const AliRawDataHeaderV3 * cdh3 = reader->GetDataHeaderV3();
+
+  if (!cdh && !cdh3) return kFALSE;
+
+  Bool_t scalerEvent = ((cdh ?  cdh->GetL1TriggerMessage() : cdh3->GetL1TriggerMessage()) & 0x1) == 0x1;
 
   AliDebug(3, Form("DDL Number %d totalDataWord %d\n", fCurrentDDLIndex,
                    totalDataWord));
@@ -377,7 +385,15 @@ Bool_t AliMUONRawStreamTrigger::NextDDL()
 
   Int_t totalDataWord = GetReader()->GetDataSize(); // in bytes
 
-  Bool_t scalerEvent =  GetReader()->GetDataHeader() && GetReader()->GetDataHeader()->GetL1TriggerMessage() & 0x1;
+  AliRawReader * reader = GetReader();
+  if (!reader) return kFALSE;
+
+  const AliRawDataHeader * cdh = reader->GetDataHeader();
+  const AliRawDataHeaderV3 * cdh3 = reader->GetDataHeaderV3();
+
+  if (!cdh && !cdh3) return kFALSE;
+
+  Bool_t scalerEvent = ((cdh ?  cdh->GetL1TriggerMessage() : cdh3->GetL1TriggerMessage()) & 0x1) == 0x1;
 
 
   UInt_t *buffer = new UInt_t[totalDataWord/4];

diff --git a/MUON/AliMUONRawStreamTriggerHP.cxx b/MUON/AliMUONRawStreamTriggerHP.cxx
index aa9b12a2f460eecc31c570e3f1cf91dd6a7110f6..f8219be320f930d531484af48ac18b4d326f8842 100644 (file)
--- a/MUON/AliMUONRawStreamTriggerHP.cxx
+++ b/MUON/AliMUONRawStreamTriggerHP.cxx
@@ -242,7 +242,15 @@ Bool_t AliMUONRawStreamTriggerHP::NextDDL()
                // use AliMUONRawStreamTriggerHP::GetDDL()
        
        // Check if this is a scalar event.
-       bool scalerEvent = (GetReader()->GetDataHeader()->GetL1TriggerMessage() & 0x1) == 0x1;
+       AliRawReader * reader = GetReader();
+       if (!reader) return kFALSE;
+
+       const AliRawDataHeader * cdh = reader->GetDataHeader();
+       const AliRawDataHeaderV3 * cdh3 = reader->GetDataHeaderV3();
+
+       if (!cdh && !cdh3) return kFALSE;
+
+       bool scalerEvent = ((cdh ?  cdh->GetL1TriggerMessage() : cdh3->GetL1TriggerMessage()) & 0x1) == 0x1;
        
        bool result = false;
        try
@@ -728,7 +736,7 @@ void AliMUONRawStreamTriggerHP::AliDecoderEventHandler::OnError(
                message = Form(
                        "%s (At byte %lu in DDL.)",
                        ErrorCodeToMessage(error),
-                       (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeader)
+                       (unsigned long)location - (unsigned long)fBufferStart + sizeof(AliRawDataHeaderV3)
                );
                fRawStream->GetReader()->AddMajorErrorLog(error, message);
                break;

diff --git a/MUON/AliMUONRawWriter.cxx b/MUON/AliMUONRawWriter.cxx
index d783d441343da0765c2f3ef031dfe37f96ec0cbe..7f378cdc570e5c72c3205b5cf1ce339a3827c01f 100644 (file)
--- a/MUON/AliMUONRawWriter.cxx
+++ b/MUON/AliMUONRawWriter.cxx
@@ -431,7 +431,7 @@ AliMUONRawWriter::WriteTrackerDDL(AliMpExMap& busPatchMap, Int_t iDDL)
   // total length in bytes
   // DDL header
 
-  Int_t headerSize = sizeof(AliRawDataHeader)/4;
+  Int_t headerSize = sizeof(AliRawDataHeaderV3)/4;
   
   fHeader->fSize = (totalDDLLength + headerSize) * 4;
   
@@ -465,7 +465,7 @@ Int_t AliMUONRawWriter::WriteTriggerDDL(const AliMUONVTriggerStore& triggerStore
  // DDL event one per half chamber
 
  // DDL header size
-  Int_t headerSize = sizeof(AliRawDataHeader)/4;
+  Int_t headerSize = sizeof(AliRawDataHeaderV3)/4;
 
   // global trigger for trigger pattern
   AliMUONGlobalTrigger* gloTrg = triggerStore.Global();

diff --git a/MUON/AliMUONTriggerQADataMakerRec.cxx b/MUON/AliMUONTriggerQADataMakerRec.cxx
index ae4bd54b6b2184a67f9bdddf0e89eb29a6ec7160..79e7d7b4d2fdeb5db3b8059ec6e5b69b8874788b 100644 (file)
--- a/MUON/AliMUONTriggerQADataMakerRec.cxx
+++ b/MUON/AliMUONTriggerQADataMakerRec.cxx
@@ -603,13 +603,19 @@ void AliMUONTriggerQADataMakerRec::MakeRaws(AliRawReader* rawReader)
     Int_t countAllBoards = 0;
 
     Bool_t containTriggerData = kFALSE;
-  Bool_t hasReadoutErrors = kFALSE;
+    Bool_t hasReadoutErrors = kFALSE;
     AliMUONRawStreamTriggerHP rawStreamTrig(rawReader);
     while (rawStreamTrig.NextDDL()) 
       {
        containTriggerData = kTRUE;
 
-        Bool_t scalerEvent =  rawReader->GetDataHeader()->GetL1TriggerMessage() & 0x1;
+       const AliRawDataHeader * cdh = rawReader->GetDataHeader();
+       const AliRawDataHeaderV3 * cdh3 = rawReader->GetDataHeaderV3();
+       
+       if (!cdh && !cdh3) continue;
+
+       Bool_t scalerEvent = ((cdh ?  cdh->GetL1TriggerMessage() : cdh3->GetL1TriggerMessage()) & 0x1) == 0x1;
+
         if ( scalerEvent ) AliDebug(1,Form("Scaler event: evtSpecie recoParam %s  QA %s\n",
                                            AliRecoParam::GetEventSpecieName(AliRecoParam::Convert(GetRecoParam()->GetEventSpecie())),
                                            AliRecoParam::GetEventSpecieName(CurrentEventSpecie())));

diff --git a/TPC/Util/AliTPCAltroEmulator.cxx b/TPC/Util/AliTPCAltroEmulator.cxx
index 35e3ce1fd2ae2d420ea98391b21f5f99f43526f3..e31ceb4258046c29b470398835edb2a3d0a226a3 100644 (file)
--- a/TPC/Util/AliTPCAltroEmulator.cxx
+++ b/TPC/Util/AliTPCAltroEmulator.cxx
@@ -40,7 +40,8 @@
 #include <AliRawEquipmentHeader.h>
 #include <AliTPCRawStreamV3.h>
 #include <TCanvas.h>
-
+#include <AliRawDataHeader.h>
+#include <AliRawDataHeaderV3.h>
 
 /**    @brief Consturctor of Altro Class
  *
@@ -1317,10 +1318,15 @@ void AliTPCAltroEmulator::RunEmulationOnRAWdata(AliRawReader *reader, Int_t plot
       UInt_t  *trailerDDL =fTrailers+ddlID*9         ;
       
       // CDH 
-      for (Int_t i=0;i<8;++i)
+      const AliRawDataHeader * cdh = fReader->GetDataHeader();
+      const AliRawDataHeaderV3 * cdhV3 = fReader->GetDataHeaderV3();
+      for (Int_t i=0;i<8;++i) {
        // just to show how ugly it is...
-       cdhDDL[i]=reinterpret_cast<UInt_t*>(const_cast<AliRawDataHeader*>(fReader->GetDataHeader()))[i]; 
-      
+       if (cdh)
+         cdhDDL[i]=reinterpret_cast<UInt_t*>(const_cast<AliRawDataHeader*>(cdh))[i]; 
+       if (cdhV3)
+         cdhDDL[i]=reinterpret_cast<UInt_t*>(const_cast<AliRawDataHeaderV3*>(cdhV3))[i]; 
+      }
       // PAYLOAD
       while (fDecoder->NextChannel()) {
        Int_t hwaddr=fDecoder->GetHWAddress();

diff --git a/ZDC/AliZDCRawStream.cxx b/ZDC/AliZDCRawStream.cxx
index 19e396c22f3912ce7d7e2d5de801ef105926444f..ba0c166650409aacf9dc7acd2ea921b0918e7021 100644 (file)
--- a/ZDC/AliZDCRawStream.cxx
+++ b/ZDC/AliZDCRawStream.cxx
@@ -268,15 +268,16 @@ void AliZDCRawStream::ReadCDHHeader()
 {
   // Reading CDH 
   const AliRawDataHeader* header = fRawReader->GetDataHeader();
-  if(!header) {
+  const AliRawDataHeaderV3* headerV3 = fRawReader->GetDataHeaderV3();
+  if(!header && !headerV3) {
       AliError(" No CDH in raw data streaming");
       fRawReader->AddMajorErrorLog(kCDHError);
       return;
   }
-  else{
+
     //printf("\t AliZDCRawStream::ReadCDHHeader -> Data Size = %x\n",fRawReader->GetDataSize());
 
-    UChar_t message = header->GetAttributes();
+  UChar_t message = header ? header->GetAttributes() : headerV3->GetAttributes();
     //printf("\t AliZDCRawStream::ReadCDHHeader -> Attributes %x\n",message);
     
     if((message & 0xf0) == 0x0){ // PHYSICS RUN
@@ -315,9 +316,8 @@ void AliZDCRawStream::ReadCDHHeader()
        //AliInfo("\t ZDC readout card used: ZRC");
     }
 
-    if(header->GetL1TriggerMessage() & 0x1){ // Calibration bit set in CDH
-      fIsCalib = kTRUE;
-    }
+    fIsCalib = (header ? header->GetL1TriggerMessage() : headerV3->GetL1TriggerMessage()) & 0x1;
+
     //printf("\t AliZDCRawStream::ReadCDHHeader -> L1TriggerMessage %x\n",header->GetL1TriggerMessage());
     //printf("\t AliZDCRawStream::ReadCDHHeader -> Calibration bit = %d\n",fIsCalib);    
     
@@ -367,7 +367,6 @@ void AliZDCRawStream::ReadCDHHeader()
       fRawReader->AddMajorErrorLog(kDARCError);
     }
     */
-  }
   
 }