small improvement on class AliTOFcalibHisto, which adds further external flexibility...

diff --git a/TOF/AliTOFPreprocessor.cxx b/TOF/AliTOFPreprocessor.cxx
index 2b841a23c71380a0aa5de6bba555353ffc87e3af..5a6387fcb500489e84f883823c5bb773f39e6d7f 100644 (file)
--- a/TOF/AliTOFPreprocessor.cxx
+++ b/TOF/AliTOFPreprocessor.cxx
@@ -1171,12 +1171,11 @@ AliTOFPreprocessor::FillWithCosmicCalibration(AliTOFChannelOnlineArray *cal)
   
   /* loop over channel index */
   for (Int_t iIndex = 0; iIndex < fNChannels; iIndex++) {
-    cal->SetDelay(iIndex, calibHisto.GetNominalCorrection(iIndex));
+    cal->SetDelay(iIndex, calibHisto.GetFullCorrection(iIndex));
   }
   
 }
 
-
 //_____________________________________________________________________________
 
 void

diff --git a/TOF/AliTOFcalibHisto.cxx b/TOF/AliTOFcalibHisto.cxx
index 06e857489b2eed133c527b5a194615ce82895508..2c4cd36af9a00ad77cffed57a3f2c8499613c332 100644 (file)
--- a/TOF/AliTOFcalibHisto.cxx
+++ b/TOF/AliTOFcalibHisto.cxx
@@ -168,6 +168,36 @@ const Float_t AliTOFcalibHisto::fgkInterfaceCardLength[48] = {
 
 //__________________________________________________________________________
 
+Bool_t AliTOFcalibHisto::fgCableCorrectionFlag[kNcorrections] = {
+  kFALSE, // kDDLBCcorr
+  kTRUE, // kAmphenolCableCorr
+  kTRUE, // kFlatCableCorr
+  kTRUE, // kInterfaceCardCorr
+  kFALSE, // kDDLdelayCorr
+  kFALSE, // kHPTDCdelayCorr
+  kFALSE, // kFEAchDelayCorr
+  kFALSE, // kFEAdelayCorr
+  kFALSE, // kTRMdelayCorr
+  kFALSE, // kTimeSlewingCorr
+};
+
+//__________________________________________________________________________
+
+Bool_t AliTOFcalibHisto::fgFullCorrectionFlag[kNcorrections] = {
+  kFALSE, // kDDLBCcorr
+  kTRUE, // kAmphenolCableCorr
+  kTRUE, // kFlatCableCorr
+  kTRUE, // kInterfaceCardCorr
+  kTRUE, // kDDLdelayCorr
+  kTRUE, // kHPTDCdelayCorr
+  kTRUE, // kFEAchDelayCorr
+  kTRUE, // kFEAdelayCorr
+  kTRUE, // kTRMdelayCorr
+  kFALSE, // kTimeSlewingCorr
+};
+
+//__________________________________________________________________________
+
 AliTOFcalibHisto::AliTOFcalibHisto() :
   TObject(),
   fCalibConst(),
@@ -495,3 +525,29 @@ AliTOFcalibHisto::ApplyNominalCorrection(AliESDtrack *track)
   track->SetTOFsignal(time);
 }
 
+//__________________________________________________________________________
+
+Float_t
+AliTOFcalibHisto::GetCableCorrection(Int_t index)
+{
+  /* get cable correction */
+  Float_t corr = 0;
+  for (Int_t iCorr = 0; iCorr < kNcorrections; iCorr++)
+    if (fgCableCorrectionFlag[iCorr])
+      corr += GetCorrection(iCorr, index);
+  return corr;
+}
+
+//__________________________________________________________________________
+
+Float_t
+AliTOFcalibHisto::GetFullCorrection(Int_t index)
+{
+  /* get full correction */
+  Float_t corr = 0;
+  for (Int_t iCorr = 0; iCorr < kNcorrections; iCorr++)
+    if (fgFullCorrectionFlag[iCorr])
+      corr += GetCorrection(iCorr, index);
+  return corr;
+}
+

diff --git a/TOF/AliTOFcalibHisto.h b/TOF/AliTOFcalibHisto.h
index b49fb5b4908fba26c11518dc46c1b5b4da22301b..5ad6491c778bb5ebde2ef9c9275ac535fc1d665d 100644 (file)
--- a/TOF/AliTOFcalibHisto.h
+++ b/TOF/AliTOFcalibHisto.h
@@ -109,6 +109,9 @@ public TObject
   static const Float_t fgkFlatCableLength[91]; /* strip flat-cable length */
   static const Float_t fgkInterfaceCardLength[48]; /* interface card length */
 
+  static Bool_t fgCableCorrectionFlag[kNcorrections]; // cable correction flag
+  static Bool_t fgFullCorrectionFlag[kNcorrections]; // full correction flag
+
   TH1F *fCalibConst[kNcalibConsts]; // calib const array
   TH1F *fCalibMap[kNcalibMaps]; // calib map array
   TH1F *fCalibPar[kNcalibPars]; // calib par array
@@ -135,6 +138,8 @@ public TObject
   /* setters */
   static void SetCalibHistoFileName(const Char_t *value) {fgCalibHistoFileName = value;}; /* set calib histo file name */
   static void SetCalibParFileName(const Char_t *value) {fgCalibParFileName = value;}; /* set calib par file name */
+  static void SetCableCorrectionFlag(Int_t i, Bool_t flag) {if (i < kNcorrections) fgCableCorrectionFlag[i] = flag;}; // set cable correction flag
+  static void SetFullCorrectionFlag(Int_t i, Bool_t flag) {if (i < kNcorrections) fgFullCorrectionFlag[i] = flag;}; // set full correction flag
 
   /* methods */
   static Int_t GetIndexEO(Int_t ddl, Int_t trm, Int_t chain, Int_t tdc, Int_t channel) {return (channel + 8 * tdc + 120 * chain + 240 * trm + 2400 * ddl);}; /* get index EO */
@@ -147,6 +152,9 @@ public TObject
   Float_t GetCorrection(Int_t corr, Int_t index, Float_t tot = 0.); /* get correction */
   Float_t GetNominalCorrection(Int_t index); /* get nominal correction */
   void ApplyNominalCorrection(AliESDtrack *track); /* apply nominal corrections */
+
+  Float_t GetCableCorrection(Int_t index); /* get cable correction */
+  Float_t GetFullCorrection(Int_t index); /* get full correction */
   
   ClassDef(AliTOFcalibHisto, 1);