1. Adding new transformation - for A and C side alignment

[u/mrichter/AliRoot.git] / ZDC / AliZDCRawStream.h

diff --git a/ZDC/AliZDCRawStream.h b/ZDC/AliZDCRawStream.h
index 3c4ed0a4386974f0d8381665987138a2128590d7..c1cdebb8f8bed92adf8eb9ff30698f4c8e185df2 100644 (file)
--- a/ZDC/AliZDCRawStream.h
+++ b/ZDC/AliZDCRawStream.h
@@ -50,6 +50,7 @@ class AliZDCRawStream: public TObject {
     AliCDBStorage *SetStorage(const char* uri);
     AliZDCChMap   *GetChMap() const;
     
+    Int_t  GetNChannelsOn()           const {return fNChannelsOn;}
     Int_t  GetCabledSignal()           const {return fCabledSignal;}
     Int_t  GetADCModFromMap(Int_t i)   const {return fMapADC[i][0];}
     Int_t  GetADCChFromMap(Int_t i)    const {return fMapADC[i][1];}
@@ -69,7 +70,8 @@ class AliZDCRawStream: public TObject {
     UInt_t GetScGeo() const {return fScGeo;}       
     UInt_t GetScTS() const {return fScTS;}         
     UInt_t GetTriggerNumber() const {return fScTriggerNumber;}
-
+    
+    void SetNChannelsOn(Int_t val) {fNChannelsOn = val;}
     void SetSector(Int_t i, Int_t val) {fSector[i] = val;}
     void SetMapADCMod(Int_t iraw, Int_t imod) {fMapADC[iraw][0]=imod;}
     void SetMapADCCh(Int_t iraw, Int_t ich)   {fMapADC[iraw][1]=ich;}
@@ -79,13 +81,18 @@ class AliZDCRawStream: public TObject {
     
     void SetSODReading(Bool_t iset) {fSODReading = iset;}
     
+    // Error codes in raw data streaming
     enum EZDCRawStreamError{
        kCDHError = 1,
        kDARCError = 2,
        kZDCDataError = 3,
        kInvalidADCModule = 4,
        kInvalidSector = 5};
-
+    
+    // Signal codes for ZDC 
+    // Same codes used in DAQ configuration file
+    // To be changed ONLY IF this file is changed!!! 
+    // **** DO NOT CHANGE THE FOLLOWING LINES!!! ****
     enum ZDCSignal{kNotConnected=0, kVoid=1,
         kZNAC=2, kZNA1=3, kZNA2=4, kZNA3=5, kZNA4=6,
         kZPAC=7, kZPA1=8, kZPA2=9, kZPA3=10, kZPA4=11,
@@ -105,11 +112,13 @@ class AliZDCRawStream: public TObject {
     AliZDCRawStream& operator = (const AliZDCRawStream& stream);
 
     AliRawReader* fRawReader;    // object for reading the raw data
-
+    
+    // Data for buffer decoding
     UInt_t fBuffer;          // DARC header + ADC buffer
     UInt_t fEvType;          // Event type
     Int_t  fPosition;        // bit position in buffer data word
     
+    // Boolean variables indicating data type
     Bool_t fIsCalib;         // True when calibration run
     Bool_t fIsDARCHeader;     // True when DARC header
     Bool_t fIsChMapping;      // True when reading ch. mapping
@@ -146,11 +155,12 @@ class AliZDCRawStream: public TObject {
     Bool_t fIsScEventGood;   // true if scaler event is good
     
     // Channel mapping 
+    Int_t  fNChannelsOn;   // No. of signals/ADC ch. used
     Int_t  fNConnCh;       // current mapped ch.
     Int_t  fCabledSignal;  // physics signal (from enum)
     Int_t  fMapADC[48][5]; // ADC map for the current run
         
-    ClassDef(AliZDCRawStream, 7)    // class for reading ZDC raw digits
+    ClassDef(AliZDCRawStream, 9)    // class for reading ZDC raw digits
 };
 
 #endif