updating misleading comments - incorrect number of supermodules

[u/mrichter/AliRoot.git] / EMCAL / AliEMCALCalibTimeDepCorrection.h

diff --git a/EMCAL/AliEMCALCalibTimeDepCorrection.h b/EMCAL/AliEMCALCalibTimeDepCorrection.h
index 7db1d8620fce39b2cef46afea98c023e599de5fd..8fc4f539b28e129a9e508560ba0b16f32d95f834 100644 (file)
--- a/EMCAL/AliEMCALCalibTimeDepCorrection.h
+++ b/EMCAL/AliEMCALCalibTimeDepCorrection.h
@@ -7,19 +7,47 @@
 /* $Id: $ */
 
 #include <TObject.h>
+#include <TObjArray.h>
 #include <TArrayF.h>
 #include "AliEMCALGeoParams.h"
 class TString;
-class TArrayF;
+class TTree;
 
 /*
-  Objects of this class read txt file with APD data
-  AliEMCALCalibTimeDepCorrection inherits TObject only to use AliLog "functions".
+  Objects of this class contain info on time-dependent corrections
 */
 
+// ******* internal class definition *************
+// 1 SuperModule's worth of info
+class AliEMCALSuperModuleCalibTimeDepCorrection : public TObject {
+ public:
+  AliEMCALSuperModuleCalibTimeDepCorrection(const int smNum=0) : TObject(), // just init values
+    fSuperModuleNum(smNum)
+    {
+      for (int icol=0; icol<AliEMCALGeoParams::fgkEMCALCols; icol++) {
+       for (int irow=0; irow<AliEMCALGeoParams::fgkEMCALRows; irow++) {
+         fCorrection[icol][irow].Reset();
+       }
+      }
+    }
+
+ public:
+  void SetSuperModuleNum(Int_t i) { fSuperModuleNum = i;}; // 
+  Int_t GetSuperModuleNum() const { return fSuperModuleNum;}; // 
+  TArrayF * GetCorrection(int icol, int irow) 
+    { return &fCorrection[icol][irow]; };
+
+ private:
+  Int_t fSuperModuleNum; // SM id
+  TArrayF fCorrection[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // values
+
+  ClassDef(AliEMCALSuperModuleCalibTimeDepCorrection, 2) // help class
+};
+// ******* end of internal class definition *************
+
 class AliEMCALCalibTimeDepCorrection : public TObject {
-public:
-  AliEMCALCalibTimeDepCorrection();
+ public:
+  AliEMCALCalibTimeDepCorrection(const int nSM = AliEMCALGeoParams::fgkEMCALModules);
 
   // interface methods; getting the whole struct should be more efficient though
   void InitCorrection(Int_t nSM, Int_t nBins, Float_t val=1.0); // assign a certain value to all 
@@ -27,28 +55,25 @@ public:
   void SetCorrection(Int_t smIndex, Int_t iCol, Int_t iRow, Int_t iBin, Float_t val=1.0); // assign a certain value to a given bin
   Float_t GetCorrection(Int_t smIndex, Int_t iCol, Int_t iRow, Int_t iBin) const; // assign a certain value to a given bin
  
-
   // Read and Write txt I/O methods are normally not used, but are useful for 
   // filling the object before it is saved in OCDB 
-  void ReadCalibTimeDepCorrectionInfo(Int_t nSM, const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
-
-  void WriteCalibTimeDepCorrectionInfo(const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
+  void ReadTextInfo(Int_t nSM, const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to fgkEMCALModules
+  void WriteTextInfo(const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to fgkEMCALModules
+  void ReadRootInfo(const TString &rootFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to fgkEMCALModules
+  void ReadTreeInfo(TTree *treeGlob, TTree *treeCorr, Bool_t swapSides=kFALSE); // info file is for nSm=1 to fgkEMCALModules
+  void WriteRootInfo(const TString &rootFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to fgkEMCALModules
 
   virtual ~AliEMCALCalibTimeDepCorrection();
 
-  struct AliEMCALSuperModuleCalibTimeDepCorrection {
-    Int_t fSuperModuleNum;
-    TArrayF fCorrection[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; 
-  };
-
   // pointer to stored info.
   Int_t GetNSuperModule() const { return fNSuperModule; }; 
-  AliEMCALSuperModuleCalibTimeDepCorrection * GetSuperModuleData() const { return fSuperModuleData; };
-
+ 
   // - via the index in the stored array:
-  virtual AliEMCALSuperModuleCalibTimeDepCorrection GetSuperModuleCalibTimeDepCorrectionId(Int_t smIndex) const;
+  virtual AliEMCALSuperModuleCalibTimeDepCorrection * GetSuperModuleCalibTimeDepCorrectionId(Int_t smIndex) const
+    { return (AliEMCALSuperModuleCalibTimeDepCorrection*) fSuperModuleData[smIndex]; };
+
   // - or via the actual SM number
-  virtual AliEMCALSuperModuleCalibTimeDepCorrection GetSuperModuleCalibTimeDepCorrectionNum(Int_t smNum) const;
+  virtual AliEMCALSuperModuleCalibTimeDepCorrection * GetSuperModuleCalibTimeDepCorrectionNum(Int_t smNum) const;
 
   void SetStartTime(UInt_t ui) { fStartTime = ui; } //
   void SetNTimeBins(Int_t i) { fNTimeBins = i; } // 
@@ -58,10 +83,12 @@ public:
   Int_t GetNTimeBins() const { return fNTimeBins; } // 
   Int_t GetTimeBinSize() const { return fTimeBinSize; } // 
 
+  static Int_t GetMaxTimeBins() { return fgkMaxTimeBins; }
+
 protected:
 
   Int_t          fNSuperModule; // Number of supermodules.
-  AliEMCALSuperModuleCalibTimeDepCorrection *fSuperModuleData; // SuperModule data
+  TObjArray fSuperModuleData; // SuperModule data
 
 private:
 
@@ -72,7 +99,9 @@ private:
   Int_t fNTimeBins; // how many timestamp bins do we have
   Int_t fTimeBinSize; // seconds per time-bin
 
-  ClassDef(AliEMCALCalibTimeDepCorrection, 2) //
+  static const Int_t fgkMaxTimeBins = 50; // we are not going to have more correction time bins than this for a single runnumber.. 
+
+  ClassDef(AliEMCALCalibTimeDepCorrection, 3) //
 };
 
 #endif