SOD enum updated to include logical combination of signals

diff --git a/ZDC/AliZDCRawStream.cxx b/ZDC/AliZDCRawStream.cxx
index a406e485cacb404945a8a4d5b70e5ab92357974e..30bd880d071415bb47e73bc925456dea08ade881 100644 (file)
--- a/ZDC/AliZDCRawStream.cxx
+++ b/ZDC/AliZDCRawStream.cxx
@@ -251,28 +251,28 @@ void AliZDCRawStream::ReadCDHHeader()
     UChar_t message = header->GetAttributes();
     //printf("\t AliZDCRawStream::ReadCDHHeader -> Attributes %x\n",message);
     
-    if((message & 0x0) == 0x0){ // PHYSICS RUN
+    if((message & 0xf0) == 0x0){ // PHYSICS RUN
        //printf("\t PHYSICS RUN raw data found\n");
     }
-    else if((message & 0x10) == 0x10){ // COSMIC RUN
+    else if((message & 0xf0) == 0x10){ // COSMIC RUN
        //printf("\t STANDALONE_COSMIC RUN raw data found\n");
     }
-    else if((message & 0x20) == 0x20){ // PEDESTAL RUN
+    else if((message & 0xf0) == 0x20){ // PEDESTAL RUN
        //printf("\t STANDALONE_PEDESTAL RUN raw data found\n");
     }
-    else if((message & 0x30) == 0x30){ // LASER RUN
+    else if((message & 0xf0) == 0x30){ // LASER RUN
        //printf("\t STANDALONE_LASER RUN raw data found\n");
     }
-    else if((message & 0x40) == 0x40){ // CALIBRATION_CENTRAL RUN
+    else if((message & 0xf0) == 0x40){ // CALIBRATION_CENTRAL RUN
        //printf("\t CALIBRATION_CENTRAL RUN raw data found\n");
     }
-    else if((message & 0x50) == 0x50){ // CALIBRATION_SEMICENTRAL
+    else if((message & 0xf0) == 0x50){ // CALIBRATION_SEMICENTRAL
        //printf("\t CALIBRATION_SEMICENTRAL RUN raw data found\n");
     }
-    else if((message & 0x60) == 0x60){ // CALIBRATION_MB
+    else if((message & 0xf0) == 0x60){ // CALIBRATION_MB
        //printf("\t CALIBRATION_MB RUN raw data found\n");
     }
-    else if((message & 0x70) == 0x70){ // CALIBRATION_EMD
+    else if((message & 0xf0) == 0x70){ // CALIBRATION_EMD
        //printf("\t CALIBRATION_EMD RUN raw data found\n");
     }
     // *** Checking the bit indicating the used readout card

diff --git a/ZDC/AliZDCRawStream.h b/ZDC/AliZDCRawStream.h
index 4855fa8fcbcb7091c9c86e15a383f0a6441345fc..4dd2092b464541ca11be028edb279683818ae219 100644 (file)
--- a/ZDC/AliZDCRawStream.h
+++ b/ZDC/AliZDCRawStream.h
@@ -53,7 +53,14 @@ class AliZDCRawStream: public TObject {
         kZPCCD=76, kZPC1CD=77, kZPC2D=78, kZPC3D=79, kZPC4D=80,
         kZEM1D=81, kZEM2D=82,
         kZDCAMonD=83, kZDCCMonD=84,
-        kZNAD=85, kZPAD=86, kZNCD=87, kZPCD=88, kZEMD=89};
+        kZNAD=85, kZPAD=86, kZNCD=87, kZPCD=88, kZEMD=89,
+         kLogical00=90, kLogical01=91, kLogical02=92, kLogical03=93, kLogical04=94, 
+        kLogical05=95, kLogical06=96, kLogical07=97, kLogical08=98, kLogical09=99, 
+        kLogical10=100, kLogical11=101, kLogical12=102, kLogical13=103, kLogical14=104, 
+        kLogical15=105, kLogical16=106, kLogical17=107, kLogical18=108, kLogical19=109, 
+        kLogical20=110, kLogical21=111, kLogical22=112, kLogical23=113, kLogical24=114, 
+        kLogical25=115, kLogical26=116, kLogical27=117, kLogical28=118, kLogical29=119, 
+        kLogical30=120, kLogical31=121};
     
     // Error codes in raw data streaming
     enum EZDCRawStreamError{