Remove t0 again from global calibration

diff --git a/TRD/AliTRDcalibDB.cxx b/TRD/AliTRDcalibDB.cxx
index 23aa5635f75ae2bea78f6bd057429b1fcfe731a1..082aba5ff11e88f3aac84d72e19e1bc59f81bc5f 100644 (file)
--- a/TRD/AliTRDcalibDB.cxx
+++ b/TRD/AliTRDcalibDB.cxx
@@ -382,12 +382,6 @@ Float_t AliTRDcalibDB::GetT0(Int_t det, Int_t col, Int_t row)
   // Returns t0 for the given pad.
   //
   
-  const AliTRDCalGlobals *calGlobal  = dynamic_cast<const AliTRDCalGlobals *> 
-                                       (GetCachedCDBObject(kIDGlobals));
-  if (!calGlobal) {
-    return -1;
-  }
-
   const AliTRDCalPad     *calPad     = dynamic_cast<const AliTRDCalPad *> 
                                        (GetCachedCDBObject(kIDT0Pad));
   if (!calPad) {
@@ -405,9 +399,7 @@ Float_t AliTRDcalibDB::GetT0(Int_t det, Int_t col, Int_t row)
     return -1;
   }
 
-  return calGlobal->GetT0Offset() 
-       + calChamber->GetValue(det) 
-       + roc->GetValue(col,row);
+  return calChamber->GetValue(det) + roc->GetValue(col,row);
 
 }
 

diff --git a/TRD/Cal/AliTRDCalGlobals.cxx b/TRD/Cal/AliTRDCalGlobals.cxx
index b5eada0838866ed705ebfba0530956d3003e367b..c92c404017db82b0d6c173395c9d95b1bd57bb16 100644 (file)
--- a/TRD/Cal/AliTRDCalGlobals.cxx
+++ b/TRD/Cal/AliTRDCalGlobals.cxx
@@ -34,7 +34,9 @@ AliTRDCalGlobals::AliTRDCalGlobals()
   ,fTailCancelationAmp(0)
   ,fPedestal(0)
   ,fADCClockphase(0)
-  ,fT0Offset(0)
+  ,fConfigID(0)
+  ,fGainTableID(0)
+  ,fPretriggerConf(0)
 {
   //
   // AliTRDCalGlobals default constructor
@@ -51,7 +53,9 @@ AliTRDCalGlobals::AliTRDCalGlobals(const Text_t *name, const Text_t *title)
   ,fTailCancelationAmp(0)
   ,fPedestal(0)
   ,fADCClockphase(0)
-  ,fT0Offset(0)
+  ,fConfigID(0)
+  ,fGainTableID(0)
+  ,fPretriggerConf(0)
 {
   //
   // AliTRDCalGlobals constructor

diff --git a/TRD/Cal/AliTRDCalGlobals.h b/TRD/Cal/AliTRDCalGlobals.h
index ef9b83c05750529575d71cf107e7d73e2b77615e..3cee21b890f6a41a36d202e2c7827f04a99db96c 100644 (file)
--- a/TRD/Cal/AliTRDCalGlobals.h
+++ b/TRD/Cal/AliTRDCalGlobals.h
@@ -29,7 +29,6 @@ class AliTRDCalGlobals : public TNamed {
   void    SetTailCancelationAmp(Int_t amp)   { fTailCancelationAmp  = amp;   }
   void    SetPedestal(Int_t ped)             { fPedestal            = ped;   }
   void    SetADCClockphase(Float_t cp)       { fADCClockphase       = cp;    }
-  void    SetT0Offset(Float_t t0)            { fT0Offset            = t0;    }
   void    SetConfigID(TString id)            { fConfigID            = id;    }
   void    SetGainTableID(TString id)         { fGainTableID         = id;    }
   void    SetPretriggerConf(TString conf)    { fPretriggerConf      = conf;  }
@@ -40,7 +39,6 @@ class AliTRDCalGlobals : public TNamed {
   Int_t   GetTailCancelationAmp() const      { return fTailCancelationAmp;   }
   Int_t   GetPedestal() const                { return fPedestal;             }
   Float_t GetADCClockphase() const           { return fADCClockphase;        }
-  Float_t GetT0Offset() const                { return fT0Offset;             }
   TString GetConfigID() const                { return fConfigID;             }
   TString GetGainTableID() const             { return fGainTableID;          }
   TString GetPretriggerConf() const          { return fPretriggerConf;       }
@@ -57,13 +55,11 @@ class AliTRDCalGlobals : public TNamed {
 
   Float_t fADCClockphase;          //  ADC clockphase in respect to TTC
 
-  Float_t fT0Offset;               //  Global offset on t0
-
   TString fConfigID;               //  Configuration ID
   TString fGainTableID;            //  Gain table ID
   TString fPretriggerConf;         //  Pretrigger configuration
 
-  ClassDef(AliTRDCalGlobals,3)     //  TRD calibration class for global TRD parameters
+  ClassDef(AliTRDCalGlobals,4)     //  TRD calibration class for global TRD parameters
 
 };
 #endif

diff --git a/TRD/Cal/AliTRDCreateDummyCDB.C b/TRD/Cal/AliTRDCreateDummyCDB.C
index eec11ae4f2b493e08f35a640898967d747a84123..c7473439a431a0caf1403a2a36a3359107069a1e 100644 (file)
--- a/TRD/Cal/AliTRDCreateDummyCDB.C
+++ b/TRD/Cal/AliTRDCreateDummyCDB.C
@@ -57,7 +57,7 @@ TObject *CreateDetObject(const char *shortName, const char *description
 }
 
 //_____________________________________________________________________________
-TObject *CreateGlobalsObject(Float_t t0Offset = 0.0) 
+TObject *CreateGlobalsObject() 
 {
 
   AliTRDCalGlobals *object = new AliTRDCalGlobals("Globals"
@@ -72,9 +72,6 @@ TObject *CreateGlobalsObject(Float_t t0Offset = 0.0)
   object->SetPedestal(0);
   object->SetADCClockphase(0);
 
-  // Introduce negative offset to allow for fluctuations around 0
-  object->SetT0Offset(-t0Offset);
-  
   return object;
 
 }
@@ -210,8 +207,6 @@ void AliTRDCreateDummyCDB()
        << "TRD :: Creating dummy CDB with event number " 
        << gkDummyRun 
        << endl;
-
-  Float_t t0Offset = 5.0;
   
   AliCDBManager *man = AliCDBManager::Instance();
   gStorLoc = man->GetStorage("local://$ALICE_ROOT");
@@ -228,17 +223,17 @@ void AliTRDCreateDummyCDB()
 
   metaData = CreateMetaObject("AliTRDCalPad");  
 
-  obj = CreatePadObject("LocalVdrift"       ,"TRD drift velocities (local variations)",1);
-  StoreObject("TRD/Calib/LocalVdrift"       ,obj,metaData);
+  //obj = CreatePadObject("LocalVdrift"       ,"TRD drift velocities (local variations)",1);
+  //StoreObject("TRD/Calib/LocalVdrift"       ,obj,metaData);
   
-  obj = CreatePadObject("LocalT0"           ,"T0 (local variations)",0.0);
+  obj = CreatePadObject("LocalT0"           ,"T0 (local variations)",0);
   StoreObject("TRD/Calib/LocalT0"           ,obj,metaData);
 
-  obj = CreatePadObject("GainFactor"        ,"GainFactor (local variations)",1);
-  StoreObject("TRD/Calib/LocalGainFactor"   ,obj,metaData);
+  //obj = CreatePadObject("GainFactor"        ,"GainFactor (local variations)",1);
+  //StoreObject("TRD/Calib/LocalGainFactor"   ,obj,metaData);
 
-  obj = CreatePRFWidthObject();
-  StoreObject("TRD/Calib/PRFWidth"          ,obj,metaData);
+  //obj = CreatePRFWidthObject();
+  //StoreObject("TRD/Calib/PRFWidth"          ,obj,metaData);
 
   //
   // Detector objects
@@ -246,45 +241,45 @@ void AliTRDCreateDummyCDB()
 
   metaData = CreateMetaObject("AliTRDCalDet");
   
-  obj = CreateDetObject("ChamberVdrift"     ,"TRD drift velocities (detector value)", 1.5);
-  StoreObject("TRD/Calib/ChamberVdrift"     ,obj,metaData);
+  //obj = CreateDetObject("ChamberVdrift"     ,"TRD drift velocities (detector value)", 1.5);
+  //StoreObject("TRD/Calib/ChamberVdrift"     ,obj,metaData);
   
-  obj = CreateDetObject("ChamberT0"         ,"T0 (detector value)",t0Offset);
+  obj = CreateDetObject("ChamberT0"         ,"T0 (detector value)",0);
   StoreObject("TRD/Calib/ChamberT0"         ,obj,metaData);
   
-  obj = CreateDetObject("ChamberGainFactor" ,"GainFactor (detector value)", 1);
-  StoreObject("TRD/Calib/ChamberGainFactor" ,obj,metaData);
+  //obj = CreateDetObject("ChamberGainFactor" ,"GainFactor (detector value)", 1);
+  //StoreObject("TRD/Calib/ChamberGainFactor" ,obj,metaData);
   
   //
   // Global object
   //
 
   metaData = CreateMetaObject("AliTRDCalGlobals");
-  obj = CreateGlobalsObject(t0Offset);
+  obj = CreateGlobalsObject();
   StoreObject("TRD/Calib/Globals"           ,obj,metaData);
   
   //
   // Status objects
   //
 
-  metaData = CreateMetaObject("AliTRDCalChamberStatus");
-  obj = CreateChamberStatusObject();
-  StoreObject("TRD/Calib/ChamberStatus"     ,obj,metaData);
+  //metaData = CreateMetaObject("AliTRDCalChamberStatus");
+  //obj = CreateChamberStatusObject();
+  //StoreObject("TRD/Calib/ChamberStatus"     ,obj,metaData);
 
-  metaData = CreateMetaObject("AliTRDCalPadStatus");
-  obj = CreatePadStatusObject();
-  StoreObject("TRD/Calib/PadStatus"         ,obj,metaData);
+  //metaData = CreateMetaObject("AliTRDCalPadStatus");
+  //obj = CreatePadStatusObject();
+  //StoreObject("TRD/Calib/PadStatus"         ,obj,metaData);
 
-  metaData = CreateMetaObject("AliTRDCalPIDLQ");
-  obj = CreatePIDLQObject();
-  StoreObject("TRD/Calib/PIDLQ"             ,obj,metaData);
+  //metaData = CreateMetaObject("AliTRDCalPIDLQ");
+  //obj = CreatePIDLQObject();
+  //StoreObject("TRD/Calib/PIDLQ"             ,obj,metaData);
 
   //
   // Monitoring object
   //
 
-  metaData = CreateMetaObject("AliTRDCalMonitoring");
-  obj = CreateMonitoringObject();
-  StoreObject("TRD/Calib/MonitoringData"    ,obj,metaData);
+  //metaData = CreateMetaObject("AliTRDCalMonitoring");
+  //obj = CreateMonitoringObject();
+  //StoreObject("TRD/Calib/MonitoringData"    ,obj,metaData);
 
 }

diff --git a/TRD/Calib/ChamberT0/Run0_0_v0_s0.root b/TRD/Calib/ChamberT0/Run0_0_v0_s0.root
index bd038e6c608e30930f6673f0e5dd65d04e2a7c5a..87c11a591b1ce3dca416ee958d6e6dc864b778d9 100644 (file)
Binary files a/TRD/Calib/ChamberT0/Run0_0_v0_s0.root and b/TRD/Calib/ChamberT0/Run0_0_v0_s0.root differ

diff --git a/TRD/Calib/Globals/Run0_0_v0_s0.root b/TRD/Calib/Globals/Run0_0_v0_s0.root
index b5667503fe2912e598dc9375782eb387aa956982..99e207f14800a2f7f288a3c10a1dc5562479bb64 100644 (file)
Binary files a/TRD/Calib/Globals/Run0_0_v0_s0.root and b/TRD/Calib/Globals/Run0_0_v0_s0.root differ

diff --git a/TRD/Calib/LocalT0/Run0_0_v0_s0.root b/TRD/Calib/LocalT0/Run0_0_v0_s0.root
index d4534f56c8d63a544d4e95bc39fc74943c575b25..3371b7fdebb46ea60ea5cfc3eacc9e4463a35881 100644 (file)
Binary files a/TRD/Calib/LocalT0/Run0_0_v0_s0.root and b/TRD/Calib/LocalT0/Run0_0_v0_s0.root differ