Add online gain tables (Annika)

diff --git a/OCDB/TRD/Calib/Krypton_2011-01/Run0_999999999_v0_s0.root b/OCDB/TRD/Calib/Krypton_2011-01/Run0_999999999_v0_s0.root
new file mode 100644 (file)
index 0000000..9f0b977
Binary files /dev/null and b/OCDB/TRD/Calib/Krypton_2011-01/Run0_999999999_v0_s0.root differ

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index c558283dd6c074b7fe3517530cfb863175f7fa8b..341c49db297b09719318efd97dfc4ed8b701774f 100644 (file)
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -43,12 +43,14 @@
 #include "Cal/AliTRDCalDet.h"
 #include "Cal/AliTRDCalDCS.h"
 #include "Cal/AliTRDCalDCSv2.h"
+#include "Cal/AliTRDCalDCSFEEv2.h"
 #include "Cal/AliTRDCalPID.h"
 #include "Cal/AliTRDCalMonitoring.h"
 #include "Cal/AliTRDCalChamberStatus.h"
 #include "Cal/AliTRDCalPadStatus.h"
 #include "Cal/AliTRDCalSingleChamberStatus.h"
 #include "Cal/AliTRDCalTrkAttach.h"
+#include "Cal/AliTRDCalOnlineGainTable.h"
 
 ClassImp(AliTRDcalibDB)
 
@@ -105,6 +107,7 @@ AliTRDcalibDB::AliTRDcalibDB()
   ,fPRFwid(0)
   ,fPRFpad(0)
   ,fPIDResponse(NULL)
+  ,fOnlineGainTableID(0)
 {
   //
   // Default constructor
@@ -135,6 +138,7 @@ AliTRDcalibDB::AliTRDcalibDB(const AliTRDcalibDB &c)
   ,fPRFwid(0)
   ,fPRFpad(0)
   ,fPIDResponse(NULL)
+  ,fOnlineGainTableID(0)
 {
   //
   // Copy constructor (not that it make any sense for a singleton...)
@@ -176,7 +180,11 @@ AliTRDcalibDB::~AliTRDcalibDB()
     delete [] fPRFsmp;
     fPRFsmp = 0;
   }
-  if(fPIDResponse) delete fPIDResponse;
+
+  if (fPIDResponse) {
+    delete fPIDResponse;
+    fPIDResponse = 0x0;
+  }
 
   Invalidate();
 
@@ -225,14 +233,28 @@ const TObject *AliTRDcalibDB::GetCachedCDBObject(Int_t id)
     case kIDGainFactorChamber : 
       return CacheCDBEntry(kIDGainFactorChamber ,"TRD/Calib/ChamberGainFactor"); 
       break;
+
+    case kIDOnlineGainFactor : 
+      switch(GetOnlineGainTableID()) {
+        case 0:
+          // For testing purposes only !!!
+          AliInfo("No gain table name from OCDB. Use default table!");
+          return CacheCDBEntry(kIDOnlineGainFactor  ,"TRD/Calib/Krypton_2011-01"); 
+          break;
+        case 1:
+         // Online gain table ID 1
+          return CacheCDBEntry(kIDOnlineGainFactor  ,"TRD/Calib/Krypton_2011-01"); 
+          break;
+      }
+      break;
+
     case kIDNoiseChamber : 
-      return CacheCDBEntry(kIDNoiseChamber ,"TRD/Calib/DetNoise"); 
+      return CacheCDBEntry(kIDNoiseChamber      ,"TRD/Calib/DetNoise"); 
       break;
     case kIDNoisePad : 
-      return CacheCDBEntry(kIDNoisePad ,"TRD/Calib/PadNoise"); 
+      return CacheCDBEntry(kIDNoisePad          ,"TRD/Calib/PadNoise"); 
       break;
 
-
     // Parameters defined per pad
     case kIDPRFWidth : 
       return CacheCDBEntry(kIDPRFWidth          ,"TRD/Calib/PRFWidth"); 
@@ -258,6 +280,7 @@ const TObject *AliTRDcalibDB::GetCachedCDBObject(Int_t id)
       break;
     case kIDPIDNN : 
       return CacheCDBEntry(kIDPIDNN             ,"TRD/Calib/PIDNN");
+      break;
     case kIDPIDLQ : 
       return CacheCDBEntry(kIDPIDLQ             ,"TRD/Calib/PIDLQ"); 
       break;
@@ -308,6 +331,7 @@ const TObject *AliTRDcalibDB::CacheCDBEntry(Int_t id, const char *cdbPath)
   } 
   
   return fCDBCache[id];
+
 }
 
 //_____________________________________________________________________________
@@ -349,7 +373,10 @@ void AliTRDcalibDB::Invalidate()
     }
   }
 
+  fOnlineGainTableID = 0;
+
 }
+
 //_____________________________________________________________________________
 Float_t AliTRDcalibDB::GetNoise(Int_t det, Int_t col, Int_t row)
 {
@@ -642,6 +669,42 @@ Float_t AliTRDcalibDB::GetGainFactor(Int_t det, Int_t col, Int_t row)
 
 }
 
+//_____________________________________________________________________________
+AliTRDCalOnlineGainTableROC* AliTRDcalibDB::GetOnlineGainTableROC(Int_t det)
+{
+  //
+  // Returns the online gain factor table for a given ROC.
+  //
+  
+  const AliTRDCalOnlineGainTable *calOnline 
+     = dynamic_cast<const AliTRDCalOnlineGainTable *> 
+                                   (GetCachedCDBObject(kIDOnlineGainFactor));
+  if (!calOnline) {
+    return 0x0;
+  }
+
+  return calOnline->GetGainTableROC(det);
+
+}
+
+//_____________________________________________________________________________
+Float_t AliTRDcalibDB::GetOnlineGainFactor(Int_t det, Int_t col, Int_t row)
+{
+  //
+  // Returns the online gain factor for the given pad.
+  //
+  
+  const AliTRDCalOnlineGainTable *calOnline 
+     = dynamic_cast<const AliTRDCalOnlineGainTable *> 
+                                   (GetCachedCDBObject(kIDOnlineGainFactor));
+  if (!calOnline) {
+    return -1;
+  }
+
+  return calOnline->GetGainCorrectionFactor(det,row,col);
+
+}
+
 //_____________________________________________________________________________
 AliTRDCalROC *AliTRDcalibDB::GetGainFactorROC(Int_t det)
 {
@@ -823,6 +886,7 @@ Int_t AliTRDcalibDB::GetNumberOfTimeBinsDCS()
 
   // only remains: two different numbers >= 0
   return nMixed;
+
 }
 
 //_____________________________________________________________________________
@@ -843,7 +907,8 @@ void AliTRDcalibDB::GetFilterType(TString &filterType)
   if (!strcmp(dcsArr->At(0)->ClassName(),"AliTRDCalDCS"))   calver = 1;
   if (!strcmp(dcsArr->At(0)->ClassName(),"AliTRDCalDCSv2")) calver = 2;
 
-  if (calver == 1) {
+  if      (calver == 1) {
+
     // DCS object
     const AliTRDCalDCS *calDCS = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(esor));
     if(!calDCS){
@@ -851,7 +916,10 @@ void AliTRDcalibDB::GetFilterType(TString &filterType)
       return;
     } 
     filterType = calDCS->GetGlobalFilterType();
-  } else if (calver == 2) {
+
+  } 
+  else if (calver == 2) {
+
     // DCSv2 object
     const AliTRDCalDCSv2 *calDCSv2 = dynamic_cast<const AliTRDCalDCSv2 *>(dcsArr->At(esor));
     if(!calDCSv2){
@@ -859,12 +927,77 @@ void AliTRDcalibDB::GetFilterType(TString &filterType)
       return;
     } 
     filterType = calDCSv2->GetGlobalFilterType();
-  } else AliError("NO DCS/DCSv2 OCDB entry found!"); 
+
+  } 
+  else {
+
+    AliError("NO DCS/DCSv2 OCDB entry found!");
+
+  }
 
 }
 
 //_____________________________________________________________________________
-void AliTRDcalibDB::GetGlobalConfiguration(TString &config){
+Int_t AliTRDcalibDB::GetOnlineGainTableID()
+{
+  //
+  // Get the gain table ID from the DCS
+  //
+
+  if (fOnlineGainTableID > 0) {
+    return fOnlineGainTableID;
+  }
+
+  const TObjArray *dcsArr = dynamic_cast<const TObjArray *>(GetCachedCDBObject(kIDDCS));
+  if (!dcsArr){
+    return -1;
+  }
+
+  Int_t esor   = 0; // Take SOR
+  Int_t calver = 0; // Check CalDCS version
+  if (!strcmp(dcsArr->At(0)->ClassName(),"AliTRDCalDCS"))   calver = 1;
+  if (!strcmp(dcsArr->At(0)->ClassName(),"AliTRDCalDCSv2")) calver = 2;
+
+  if      (calver == 1) {
+
+    // No data for old DCS object available, anyway
+    return -1;
+
+  } 
+  else if (calver == 2) {
+
+    // DCSv2 object
+    const AliTRDCalDCSv2 *calDCSv2 = dynamic_cast<const AliTRDCalDCSv2 *>(dcsArr->At(esor));
+    if(!calDCSv2){
+      return -1;
+    }
+
+    TString tableName = "";
+    for (Int_t i = 0; i < 540; i++) {
+      const AliTRDCalDCSFEEv2 *calDCSFEEv2 = calDCSv2->GetCalDCSFEEObj(0);
+      tableName = calDCSFEEv2->GetGainTableName();
+      if (tableName.Length() > 0) {
+        break;
+      }
+    }
+    if (tableName.CompareTo("Krypton_2011-01") == 0) {
+      fOnlineGainTableID = 1;
+      return fOnlineGainTableID;
+    }
+
+  } 
+  else {
+
+    AliError("NO DCS/DCSv2 OCDB entry found!");
+    return -1;
+
+  }
+
+}
+
+//_____________________________________________________________________________
+void AliTRDcalibDB::GetGlobalConfiguration(TString &config)
+{
   //
   // Get Configuration from the DCS
   //
@@ -880,15 +1013,19 @@ void AliTRDcalibDB::GetGlobalConfiguration(TString &config){
   if (!strcmp(dcsArr->At(0)->ClassName(),"AliTRDCalDCS"))   calver = 1;
   if (!strcmp(dcsArr->At(0)->ClassName(),"AliTRDCalDCSv2")) calver = 2;
 
-  if (calver == 1) {
+  if      (calver == 1) {
+
     // DCS object
-    const AliTRDCalDCS *calDCS = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(esor));
+    const AliTRDCalDCS   *calDCS   = dynamic_cast<const AliTRDCalDCS *>(dcsArr->At(esor));
     if(!calDCS){
       config = "";
       return;
     } 
     config = calDCS->GetGlobalConfigName();
-  } else if (calver == 2) {
+
+  } 
+  else if (calver == 2) {
+
     // DCSv2 object
     const AliTRDCalDCSv2 *calDCSv2 = dynamic_cast<const AliTRDCalDCSv2 *>(dcsArr->At(esor));
     if(!calDCSv2){
@@ -896,7 +1033,13 @@ void AliTRDcalibDB::GetGlobalConfiguration(TString &config){
       return;
     } 
     config = calDCSv2->GetGlobalConfigName();
-  } else AliError("NO DCS/DCSv2 OCDB entry found!");
+
+  } 
+  else {
+
+    AliError("NO DCS/DCSv2 OCDB entry found!");
+
+  }
 
 }
 
@@ -906,41 +1049,58 @@ Bool_t AliTRDcalibDB::HasOnlineFilterPedestal()
   //
   // Checks whether pedestal filter was applied online
   //
+
   TString cname;
+
   // Temporary: Get the filter config from the configuration name
   GetGlobalConfiguration(cname);
   TString filterconfig = cname(cname.First("_") + 1, cname.First("-") - cname.First("_") - 1);
+
   // TString filterconfig;
   //GetFilterType(filterconfig);
+
   return filterconfig.Contains("p");
+
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDcalibDB::HasOnlineFilterGain(){
+Bool_t AliTRDcalibDB::HasOnlineFilterGain()
+{
   //
   // Checks whether online gain filter was applied
   //
+
   TString cname;
+
   // Temporary: Get the filter config from the configuration name
   GetGlobalConfiguration(cname);
   TString filterconfig = cname(cname.First("_") + 1, cname.First("-") - cname.First("_") - 1);
+
   //TString filterconfig;
   //GetFilterType(filterconfig);
+
   return filterconfig.Contains("g");
+
 }
 
 //_____________________________________________________________________________
-Bool_t AliTRDcalibDB::HasOnlineTailCancellation(){
+Bool_t AliTRDcalibDB::HasOnlineTailCancellation()
+{
   //
   // Checks whether online tail cancellation was applied
   //
+
   TString cname;
+
   // Temporary: Get the filter config from the configuration name
   GetGlobalConfiguration(cname);
   TString filterconfig = cname(cname.First("_") + 1, cname.First("-") - cname.First("_") - 1);
+
   //TString filterconfig;
   //GetFilterType(filterconfig);
+
   return filterconfig.Contains("t");
+
 }
 
 //_____________________________________________________________________________
@@ -1018,7 +1178,7 @@ AliTRDrecoParam* AliTRDcalibDB::GetRecoParam(Int_t */*eventtype*/)
   // calculate entry based on event type info
   Int_t n = 0; //f(eventtype[0], eventtype[1], ....)
 
-  return (AliTRDrecoParam*)recos->UncheckedAt(n);
+  return (AliTRDrecoParam *) recos->UncheckedAt(n);
 
 }
 
@@ -1123,8 +1283,10 @@ Bool_t AliTRDcalibDB::IsChamberMasked(Int_t det)
   return cal->IsMasked(det);
 
 }
+
 //_____________________________________________________________________________
-Bool_t AliTRDcalibDB::IsHalfChamberMasked(Int_t det, Int_t side){
+Bool_t AliTRDcalibDB::IsHalfChamberMasked(Int_t det, Int_t side)
+{
   //
   // Returns status, see name of functions for details ;-)
   //
@@ -1138,6 +1300,7 @@ Bool_t AliTRDcalibDB::IsHalfChamberMasked(Int_t det, Int_t side){
   return side > 0 ? cal->IsHalfChamberSideBMasked(det) : cal->IsHalfChamberSideAMasked(det);
 
 }
+
 //_____________________________________________________________________________
 const AliTRDCalPID *AliTRDcalibDB::GetPIDObject(AliTRDpidUtil::ETRDPIDMethod method)
 {
@@ -1159,26 +1322,40 @@ const AliTRDCalPID *AliTRDcalibDB::GetPIDObject(AliTRDpidUtil::ETRDPIDMethod met
 }
 
 //_____________________________________________________________________________
-AliTRDPIDResponse *AliTRDcalibDB::GetPIDResponse(AliTRDPIDResponse::ETRDPIDMethod method){
-  if(!fPIDResponse){
+AliTRDPIDResponse *AliTRDcalibDB::GetPIDResponse(AliTRDPIDResponse::ETRDPIDMethod method)
+{
+  //
+  // Returns the PID response object for 1D-LQ
+  //
+
+  if (!fPIDResponse) {
+
     fPIDResponse = new AliTRDPIDResponse;
+
     // Load Reference Histos from OCDB
     fPIDResponse->SetPIDmethod(method);
     const TObjArray *references = dynamic_cast<const TObjArray *>(GetCachedCDBObject(kIDPIDLQ1D));
+
     TIter refs(references);
     TObject *obj = NULL;
     AliTRDPIDReference *ref = NULL;
     Bool_t hasReference = kFALSE;
-    while((obj = refs())){
-       if((ref = dynamic_cast<AliTRDPIDReference *>(obj))){
-               fPIDResponse->Load(ref);
-               hasReference = kTRUE;
-               break;
-       }
+    while ((obj = refs())){
+      if ((ref = dynamic_cast<AliTRDPIDReference *>(obj))){
+        fPIDResponse->Load(ref);
+        hasReference = kTRUE;
+        break;
+      }
     }
-    if(!hasReference) AliError("Reference histograms not found in the OCDB");
+
+    if (!hasReference) {
+      AliError("Reference histograms not found in the OCDB");
+    }
+
   }
+
   return fPIDResponse;
+
 }
 
 //_____________________________________________________________________________
@@ -1187,9 +1364,10 @@ const AliTRDCalTrkAttach* AliTRDcalibDB::GetAttachObject()
   //
   // Returns the object storing likelihood distributions for cluster to track attachment
   //
+
   return dynamic_cast<const AliTRDCalTrkAttach*>(GetCachedCDBObject(kIDAttach));
-}
 
+}
 
 //_____________________________________________________________________________
 const AliTRDCalMonitoring *AliTRDcalibDB::GetMonitoringObject()

diff --git a/TRD/AliTRDcalibDB.h b/TRD/AliTRDcalibDB.h
index 25d7f660466952cd0537a77a822762c0d8c5bf62..d47f4a0825cacdbfeb0dae70c0f7157922bc4a5d 100644 (file)
--- a/TRD/AliTRDcalibDB.h
+++ b/TRD/AliTRDcalibDB.h
@@ -23,6 +23,8 @@
 #include "AliTRDPIDResponse.h"
 #endif
 
+class TString;
+
 class AliCDBEntry;
 
 class AliTRDrecoParam;
@@ -32,7 +34,8 @@ class AliTRDCalMonitoring;
 class AliTRDCalROC;
 class AliTRDCalDet;
 class AliTRDCalSingleChamberStatus;
-class TString;
+class AliTRDCalOnlineGainTableROC;
+
 class AliTRDcalibDB : public TObject {
 
  public:
@@ -67,6 +70,9 @@ class AliTRDcalibDB : public TObject {
   AliTRDCalROC                       *GetGainFactorROC(Int_t det);
   const AliTRDCalDet                 *GetGainFactorDet();
 
+  Float_t                             GetOnlineGainFactor(Int_t det, Int_t col, Int_t row);
+  AliTRDCalOnlineGainTableROC        *GetOnlineGainTableROC(Int_t det);
+
   AliTRDCalROC                       *GetPRFROC(Int_t det);
   Float_t                             GetPRFWidth(Int_t det, Int_t col, Int_t row);
 
@@ -78,6 +84,9 @@ class AliTRDcalibDB : public TObject {
   Int_t                               GetNumberOfTimeBinsDCS();
   void                                GetFilterType(TString &filterType);
   void                                GetGlobalConfiguration(TString &config);
+
+  Int_t                               GetOnlineGainTableID();
+
   Bool_t                              HasOnlineFilterPedestal();
   Bool_t                              HasOnlineFilterGain();
   Bool_t                              HasOnlineTailCancellation();
@@ -103,7 +112,7 @@ class AliTRDcalibDB : public TObject {
   const AliTRDCalTrkAttach           *GetAttachObject();
 
   // Related functions, these depend on calibration data
-         Int_t                        PadResponse(Double_t signal, Double_t dist
+  Int_t                               PadResponse(Double_t signal, Double_t dist
                                                 , Int_t layer, Double_t *pad) const;
 
  protected:
@@ -115,6 +124,7 @@ class AliTRDcalibDB : public TObject {
        , kIDT0Chamber
        , kIDGainFactorPad
        , kIDGainFactorChamber
+       , kIDOnlineGainFactor
        , kIDNoiseChamber
        , kIDNoisePad
        , kIDPRFWidth
@@ -148,14 +158,17 @@ class AliTRDcalibDB : public TObject {
   TObject              *fCDBCache[kCDBCacheSize];   //  Cache for calibration objects.
 
   Long64_t              fRun;                       //  Run Number
-  
+
   Float_t              *fPRFsmp;                    //! Sampled pad response
   Int_t                 fPRFbin;                    //  Number of bins for the PRF
   Float_t               fPRFlo;                     //  Lower boundary of the PRF
   Float_t               fPRFhi;                     //  Higher boundary of the PRF
   Float_t               fPRFwid;                    //  Bin width of the sampled PRF
   Int_t                 fPRFpad;                    //  Distance to next pad in PRF
+
   AliTRDPIDResponse    *fPIDResponse;               //  TRD PID Response function
+
+  Int_t                 fOnlineGainTableID;         //  ID for online gain table 
   
  private:
 
@@ -164,7 +177,7 @@ class AliTRDcalibDB : public TObject {
   AliTRDcalibDB &operator=(const AliTRDcalibDB &c); 
   virtual ~AliTRDcalibDB();
 
-  ClassDef(AliTRDcalibDB, 5)                         //  Provides central access to the CDB
+  ClassDef(AliTRDcalibDB, 7)                        //  Provides central access to the CDB
 
 };
 

diff --git a/TRD/AliTRDdigitizer.cxx b/TRD/AliTRDdigitizer.cxx
index 378053e57534701b3496a2b81e4f1bda362bfff8..8ca1249e15e6c485f87d5cf688e935680bb1f27e 100644 (file)
--- a/TRD/AliTRDdigitizer.cxx
+++ b/TRD/AliTRDdigitizer.cxx
@@ -70,6 +70,7 @@
 
 #include "Cal/AliTRDCalROC.h"
 #include "Cal/AliTRDCalDet.h"
+#include "Cal/AliTRDCalOnlineGainTableROC.h"
 
 ClassImp(AliTRDdigitizer)
 
@@ -668,6 +669,7 @@ Bool_t AliTRDdigitizer::MakeDigits()
         signals = 0x0;
         return kFALSE;
       }
+
       // Convert the detector signals to digits or s-digits
       if (!ConvertSignals(det,signals)) {
        AliError(Form("Conversion of signals failed for detector=%d",det));
@@ -689,7 +691,8 @@ Bool_t AliTRDdigitizer::MakeDigits()
   } // for: detector
 
   if (!fSDigits) {
-    if (AliDataLoader *trklLoader = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
+    if (AliDataLoader *trklLoader 
+          = AliRunLoader::Instance()->GetLoader("TRDLoader")->GetDataLoader("tracklets")) {
       if (trklLoader->Tree())
         trklLoader->WriteData("OVERWRITE");
     }
@@ -1242,9 +1245,9 @@ Bool_t AliTRDdigitizer::Signal2ADC(Int_t det, AliTRDarraySignal *signals)
     return kFALSE;
   }
 
-  // The gainfactor calibration objects
+  // The gain factor calibration objects
   const AliTRDCalDet *calGainFactorDet      = calibration->GetGainFactorDet();  
-  AliTRDCalROC       *calGainFactorROC      = 0;
+  AliTRDCalROC       *calGainFactorROC      = 0x0;
   Float_t             calGainFactorDetValue = 0.0;
 
   AliTRDarrayADC     *digits = 0x0;
@@ -1278,13 +1281,18 @@ Bool_t AliTRDdigitizer::Signal2ADC(Int_t det, AliTRDarraySignal *signals)
   calGainFactorROC      = calibration->GetGainFactorROC(det);
   calGainFactorDetValue = calGainFactorDet->GetValue(det);
 
+  // Get the online gain factors
+  AliTRDCalOnlineGainTableROC *onlineGainFactorROC 
+    = calibration->GetOnlineGainTableROC(det);
+
   // Create the digits for this chamber
   for (row  = 0; row  <  nRowMax; row++ ) {
     for (col  = 0; col  <  nColMax; col++ ) {
 
       // Check whether pad is masked
       // Bridged pads are not considered yet!!!
-      if (calibration->IsPadMasked(det,col,row) || calibration->IsPadNotConnected(det,col,row)) {
+      if (calibration->IsPadMasked(det,col,row) || 
+          calibration->IsPadNotConnected(det,col,row)) {
         continue;
       }
 

diff --git a/TRD/Cal/AliTRDCalDCSv2.h b/TRD/Cal/AliTRDCalDCSv2.h
index 4b7c5180bd90deae786f49719e690b0d7810ee87..5fa493fcaa626761626ed9b4166d3c4d5f01d967 100644 (file)
--- a/TRD/Cal/AliTRDCalDCSv2.h
+++ b/TRD/Cal/AliTRDCalDCSv2.h
@@ -61,11 +61,11 @@ class AliTRDCalDCSv2 : public TNamed {
   UInt_t  GetEndTime() const                   { return fEndTime;              }
   TObjArray*       GetFEEArr() const           { return fFEEArr;               }
   TObjArray*       GetPTRArr() const           { return fPTRArr;               }
-  AliTRDCalDCSFEEv2* GetCalDCSFEEObj(Int_t det) 
+  AliTRDCalDCSFEEv2* GetCalDCSFEEObj(Int_t det) const
                                  { return (AliTRDCalDCSFEEv2*)fFEEArr->At(det); }
-  AliTRDCalDCSPTR* GetCalDCSPTRObj(Int_t det) 
+  AliTRDCalDCSPTR* GetCalDCSPTRObj(Int_t det) const
                                  { return (AliTRDCalDCSPTR*)fPTRArr->At(det); }
-  AliTRDCalDCSGTU* GetGTUObj() 
+  AliTRDCalDCSGTU* GetGTUObj() const
                                  { return (AliTRDCalDCSGTU*)fGTUObj;          }
 
  protected:

diff --git a/TRD/Cal/AliTRDCalOnlineGainTable.cxx b/TRD/Cal/AliTRDCalOnlineGainTable.cxx
index 6dee0879be9f794dd2cea1e0567cb3462fef70ca..fd91253af40e322e6b4a25a5feb045dcd0104d74 100644 (file)
--- a/TRD/Cal/AliTRDCalOnlineGainTable.cxx
+++ b/TRD/Cal/AliTRDCalOnlineGainTable.cxx
@@ -111,7 +111,9 @@ AliTRDCalOnlineGainTable::~AliTRDCalOnlineGainTable()
 }
 
 //_____________________________________________________________________________
-Float_t AliTRDCalOnlineGainTable::GetGainCorrectionFactor(Int_t det, Int_t row, Int_t col)
+Float_t AliTRDCalOnlineGainTable::GetGainCorrectionFactor(Int_t det
+                                                        , Int_t row
+                                                        , Int_t col) const
 {
   //
   // returns the Gain Correction Factor of the channel
@@ -129,8 +131,11 @@ Float_t AliTRDCalOnlineGainTable::GetGainCorrectionFactor(Int_t det, Int_t row,
 }
 
 //_____________________________________________________________________________
-Float_t AliTRDCalOnlineGainTable::GetGainCorrectionFactor(Int_t sector, Int_t stack, Int_t layer, 
-                                               Int_t row, Int_t col)
+Float_t AliTRDCalOnlineGainTable::GetGainCorrectionFactor(Int_t sector
+                                                        , Int_t stack
+                                                        , Int_t layer
+                                                       , Int_t row
+                                                        , Int_t col) const
 { 
   //
   // returns the Gain Correction Factor of the channel

diff --git a/TRD/Cal/AliTRDCalOnlineGainTable.h b/TRD/Cal/AliTRDCalOnlineGainTable.h
index 08bb889fc9ae0e9800518ceffcc974edaaf8d1d1..9285ce4e79ae7775da38a81860550f09525dfd94 100644 (file)
--- a/TRD/Cal/AliTRDCalOnlineGainTable.h
+++ b/TRD/Cal/AliTRDCalOnlineGainTable.h
@@ -35,8 +35,8 @@ public:
   AliTRDCalOnlineGainTable& operator=(const AliTRDCalOnlineGainTable& other);
   ~AliTRDCalOnlineGainTable();
 
-  Float_t GetGainCorrectionFactor(Int_t det, Int_t row, Int_t col);
-  Float_t GetGainCorrectionFactor(Int_t sector, Int_t stack, Int_t layer, Int_t row, Int_t col);
+  Float_t GetGainCorrectionFactor(Int_t det, Int_t row, Int_t col) const;
+  Float_t GetGainCorrectionFactor(Int_t sector, Int_t stack, Int_t layer, Int_t row, Int_t col) const;
 
   Short_t GetAdcdac(Int_t det, Int_t row, Int_t col);
   Short_t GetAdcdac(Int_t sector, Int_t stack, Int_t layer, Int_t row, Int_t col);
@@ -70,7 +70,7 @@ protected:
 
   AliTRDCalOnlineGainTableROC* fROCGainTables[540]; // Array of gain tables for all ROCs
   
-  ClassDef(AliTRDCalOnlineGainTable,1);             // TRD online gain tables
+  ClassDef(AliTRDCalOnlineGainTable,2);             // TRD online gain tables
 
 };
 

diff --git a/TRD/Cal/AliTRDCalOnlineGainTableMCM.h b/TRD/Cal/AliTRDCalOnlineGainTableMCM.h
index 341ae50d461d5b1b1e68c5a581c5255e9d8b6d4c..f2250c8b9400f3c36a982446ba01955df1883652 100644 (file)
--- a/TRD/Cal/AliTRDCalOnlineGainTableMCM.h
+++ b/TRD/Cal/AliTRDCalOnlineGainTableMCM.h
@@ -57,7 +57,7 @@ protected:
   Float_t fMCMGain;  // Gain Factor which would lead to a Correction Factor of 1.0 within the MCM
 
 
-  ClassDef(AliTRDCalOnlineGainTableMCM,1); // TRD online gain table of a MCM
+  ClassDef(AliTRDCalOnlineGainTableMCM,2); // TRD online gain table of a MCM
 
 };
 

diff --git a/TRD/Cal/AliTRDCalOnlineGainTableROC.h b/TRD/Cal/AliTRDCalOnlineGainTableROC.h
index 419ccfe2d42cd08b348d08b16dae379e3dcb55db..22244e6bc8a2aa22ef5ea07fa123f0d94e4a2564 100644 (file)
--- a/TRD/Cal/AliTRDCalOnlineGainTableROC.h
+++ b/TRD/Cal/AliTRDCalOnlineGainTableROC.h
@@ -62,7 +62,7 @@ protected:
   
   AliTRDCalOnlineGainTableMCM* fMCMGainTables[128]; // Array of gain tables for MCMs
   
-  ClassDef(AliTRDCalOnlineGainTableROC,1);          // TRD online gain table of a ROC
+  ClassDef(AliTRDCalOnlineGainTableROC,2);          // TRD online gain table of a ROC
 
 };