#86058: Fixes for RAW.

[u/mrichter/AliRoot.git] / ZDC / AliZDCChMap.cxx

diff --git a/ZDC/AliZDCChMap.cxx b/ZDC/AliZDCChMap.cxx
index 9080d0e2f7b2c5cf1a3faea442950aad33d19874..bdbf94d9f52097c18bcf98464724af5a4bd0b1b3 100644 (file)
--- a/ZDC/AliZDCChMap.cxx
+++ b/ZDC/AliZDCChMap.cxx
@@ -41,16 +41,27 @@ TNamed()
   SetName(namst.Data());
   SetTitle(namst.Data());
   Reset();
-  for(Int_t i=0; i<48; i++){
+  int const kNModules = 10;
+  int const kNChannels = 48;
+  int const kNScChannels = 32;
+  for(Int_t i=0; i<kNModules; i++){
+    for(Int_t j=0; j<3; j++) fModuleMap[i][j] = 0;
+  }
+  for(Int_t i=0; i<kNChannels; i++){
     fADCModule[i] = -1;
     fADCChannel[i] = -1;
     fDetector[i] = -1;
     fSector[i] = -1;
+    fADCSignalCode[i] = -1;
   }
-  for(Int_t i=0; i<32; i++){
+  for(Int_t i=0; i<kNScChannels; i++){
     fScalerChannel[i] = -1;
     fScDetector[i] = -1;
     fScSector[i] = -1;
+    fScSignalCode[i] = -1;
+    //
+    fTDCChannel[i] = -1;
+    fTDCSignalCode[i] = -1;
   }
   
   
@@ -64,15 +75,26 @@ AliZDCChMap::AliZDCChMap(const AliZDCChMap& calibda) :
   SetName(calibda.GetName());
   SetTitle(calibda.GetName());
   Reset();
-  for(int t=0; t<48; t++){
+  int const kNModules = 10;
+  int const kNChannels = 48;
+  int const kNScChannels = 32;
+  for(Int_t i=0; i<kNModules; i++){
+     for(Int_t j=0; j<3; j++) fModuleMap[i][j] = calibda.GetModuleMap(i,j);
+  }
+  for(int t=0; t<kNChannels; t++){
      fADCModule[t]  = calibda.GetADCModule(t);
      fADCChannel[t] = calibda.GetADCChannel(t);
      fDetector[t]   = calibda.GetDetector(t);
      fSector[t]     = calibda.GetSector(t);
-     if(t<32){
+     fADCSignalCode[t]  = calibda.GetADCSignalCode(t);
+     if(t<kNScChannels){
        fScalerChannel[t] = calibda.GetScChannel(t);
        fScDetector[t]    = calibda.GetScDetector(t);
        fScSector[t]      = calibda.GetScSector(t);
+       fScSignalCode[t]  = calibda.GetScSignalCode(t);
+       //
+       fTDCChannel[t] = calibda.GetTDCChannel(t);
+       fTDCSignalCode[t] = calibda.GetTDCChannel(t);
      }
   }
 }
@@ -84,15 +106,26 @@ AliZDCChMap &AliZDCChMap::operator =(const AliZDCChMap& calibda)
   SetName(calibda.GetName());
   SetTitle(calibda.GetName());
   Reset();
-  for(int t=0; t<48; t++){
+  int const kNModules = 10;
+  int const kNChannels = 48;
+  int const kNScChannels = 32;
+  for(Int_t i=0; i<kNModules; i++){
+     for(Int_t j=0; j<3; j++) fModuleMap[i][j] = calibda.GetModuleMap(i,j);
+  }
+  for(int t=0; t<kNChannels; t++){
      fADCModule[t]  = calibda.GetADCModule(t);
      fADCChannel[t] = calibda.GetADCChannel(t);
      fDetector[t]   = calibda.GetDetector(t);
      fSector[t]     = calibda.GetSector(t);
-     if(t<32){
+     fADCSignalCode[t]  = calibda.GetADCSignalCode(t);
+     if(t<kNScChannels){
        fScalerChannel[t] = calibda.GetScChannel(t);
        fScDetector[t]    = calibda.GetScDetector(t);
        fScSector[t]      = calibda.GetScSector(t);
+       fScSignalCode[t]  = calibda.GetScSignalCode(t);
+       //
+       fTDCChannel[t] = calibda.GetTDCChannel(t);
+       fTDCSignalCode[t] = calibda.GetTDCChannel(t);
      }
   }
 
@@ -112,9 +145,13 @@ void AliZDCChMap::Reset()
   memset(fADCChannel,0,48*sizeof(Int_t));
   memset(fDetector,0,48*sizeof(Int_t));
   memset(fSector,0,48*sizeof(Int_t));
+  memset(fADCSignalCode,0,48*sizeof(Int_t));
   memset(fScalerChannel,0,32*sizeof(Int_t));
   memset(fScDetector,0,32*sizeof(Int_t));
   memset(fScSector,0,32*sizeof(Int_t));
+  memset(fScSignalCode,0,32*sizeof(Int_t));
+  memset(fTDCChannel,0,32*sizeof(Int_t));
+  memset(fTDCSignalCode,0,32*sizeof(Int_t));
 }                                                                                       
 
 
@@ -123,13 +160,24 @@ void  AliZDCChMap::Print(Option_t *) const
 {
    // Printing of calibration object
    printf("\n\n\t ******************* AliZDCChMap object *******************\n\n");
+   for(Int_t i=0; i<10; i++){
+     printf("  ******** GEO %d mod. type %d #ch. %d\n",
+      fModuleMap[i][0],fModuleMap[i][1],fModuleMap[i][2]);     
+   } 
+   printf("\n");
    for(Int_t i=0; i<48; i++) 
-     printf(" ADC - mod. %d ch. %d -> detector %d sector %d\n",
-      fADCModule[i], fADCChannel[i],fDetector[i], fSector[i]);
-   for(Int_t i=0; i<32; i++) 
+     printf(" ADC - mod. %d ch. %d signal %d -> detector %d sector %d\n",
+      fADCModule[i], fADCChannel[i], fADCSignalCode[i], fDetector[i], fSector[i]);
+   printf("\n");
+   for(Int_t i=0; i<32; i++)
      if(fScalerChannel[i]!=-1)
-       printf(" SCALER - ch. %d -> detector %d sector %d\n",
-        fScalerChannel[i],fScDetector[i], fScSector[i]);
-   printf("\n\n\t **********************************************************\n\n");
+       printf(" SCALER - ch. %d signal %d\n",
+        fScalerChannel[i], fScSignalCode[i]);
+   printf("\n");
+   for(Int_t i=0; i<32; i++) 
+     if(fTDCChannel[i]!=-1)
+       printf(" TDC - ch. %d signal %d\n",
+        fTDCChannel[i], fTDCSignalCode[i]);
+   printf("\n\t **********************************************************\n\n");
  
 }