X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=EMCAL%2FAliEMCALBiasAPD.h;h=40f2bea45f48330aefbc751f16d3d1b52acaab5b;hb=5c1827c4ae8bd526c6d3cd74463998e5e8096f47;hp=578a05088a4fe0ba9496c894fcd48e5b4443ce80;hpb=d81e64232e236a9d83c3dc91c3795b6efc2b59cf;p=u%2Fmrichter%2FAliRoot.git

diff --git a/EMCAL/AliEMCALBiasAPD.h b/EMCAL/AliEMCALBiasAPD.h
index 578a05088a4..40f2bea45f4 100644
--- a/EMCAL/AliEMCALBiasAPD.h
+++ b/EMCAL/AliEMCALBiasAPD.h
@@ -7,53 +7,86 @@
 /* $Id: $ */
 
 #include <TObject.h>
+#include <TObjArray.h>
 #include "AliEMCALGeoParams.h"
 class TString;
+class TTree;
 
 /*
-  Objects of this class read txt file with APD data
-  AliEMCALBiasAPD inherits TObject only to use AliLog "functions".
+  Objects of this class contain info on APD bias settings/voltages
 */
 
+// ******* internal class definition *************
+// 1 SuperModule's worth of info
+class AliEMCALSuperModuleBiasAPD : public TObject {
+ public:
+  AliEMCALSuperModuleBiasAPD(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++) {
+	  fElecId[icol][irow] = 0;
+	  fDAC[icol][irow] = 0;
+	  fVoltage[icol][irow] = 0;
+	}
+      }
+    }
+
+ public:
+  void SetSuperModuleNum(Int_t i) { fSuperModuleNum = i;}; // 
+  Int_t GetSuperModuleNum() const { return fSuperModuleNum;}; // 
+  void SetElecId(int icol, int irow, Int_t i) { fElecId[icol][irow] = i; }; //
+  Int_t GetElecId(int icol, int irow) const { return fElecId[icol][irow]; }; //
+  void SetDAC(int icol, int irow, Int_t i) { fDAC[icol][irow] = i; }; //
+  Int_t GetDAC(int icol, int irow) const { return fDAC[icol][irow]; }; //
+  void SetVoltage(int icol, int irow, Float_t f) { fVoltage[icol][irow] = f; }; //
+  Float_t GetVoltage(int icol, int irow) const { return fVoltage[icol][irow]; }; //
+
+ private:
+  Int_t fSuperModuleNum; // SM index
+  Int_t fElecId[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // ElectronicsIndex/Address - we keep this to help ensure that the column/row info matches with electronics indices
+  Int_t fDAC[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // 0-0x3ff register
+  Float_t fVoltage[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // 210 to ca 417 V. (function of DAC setting)
+
+  ClassDef(AliEMCALSuperModuleBiasAPD, 2) // help class
+};
+// ******* end of internal class definition *************
+
 class AliEMCALBiasAPD : public TObject {
 public:
-  AliEMCALBiasAPD();
+  AliEMCALBiasAPD(const int nSM = AliEMCALGeoParams::fgkEMCALModules);
 
   // 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 ReadBiasAPDInfo(Int_t nSM, const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
-
-  void WriteBiasAPDInfo(const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
+  void ReadTextBiasAPDInfo(Int_t nSM, const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
+  void WriteTextBiasAPDInfo(const TString &txtFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
+  void ReadRootBiasAPDInfo(const TString &rootFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
+  void ReadTreeBiasAPDInfo(TTree *tree, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
+  void WriteRootBiasAPDInfo(const TString &rootFileName, Bool_t swapSides=kFALSE); // info file is for nSm=1 to 12 SuperModules
 
   virtual ~AliEMCALBiasAPD();
 
-  struct AliEMCALSuperModuleBiasAPD {
-    Int_t fSuperModuleNum;
-    Int_t fElecId[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // ElectronicsIndex/Address - we keep this to help ensure that the column/row info matches with electronics indices
-    Int_t fDAC[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // 0-0x3ff register
-    Float_t fVoltage[AliEMCALGeoParams::fgkEMCALCols][AliEMCALGeoParams::fgkEMCALRows]; // 210 to ca 417 V. (function of DAC setting)
-  };
-
   // pointer to stored info.
   Int_t GetNSuperModule() const { return fNSuperModule; }; 
-  AliEMCALSuperModuleBiasAPD * GetSuperModuleData() const { return fSuperModuleData; };
 
   // - via the index in the stored array:
-  virtual AliEMCALSuperModuleBiasAPD GetSuperModuleBiasAPDId(Int_t smIndex) const;
+  virtual AliEMCALSuperModuleBiasAPD * GetSuperModuleBiasAPDId(Int_t smIndex) const
+    { return (AliEMCALSuperModuleBiasAPD*) fSuperModuleData[smIndex]; };
+
   // - or via the actual SM number
-  virtual AliEMCALSuperModuleBiasAPD GetSuperModuleBiasAPDNum(Int_t smNum) const;
+  virtual AliEMCALSuperModuleBiasAPD * GetSuperModuleBiasAPDNum(Int_t smNum) const;
 
 protected:
 
   Int_t 	  fNSuperModule; // Number of supermodules.
-  AliEMCALSuperModuleBiasAPD *fSuperModuleData; // SuperModule data
+  TObjArray fSuperModuleData; // SuperModule data
 
 private:
 
   AliEMCALBiasAPD(const AliEMCALBiasAPD &);
   AliEMCALBiasAPD &operator = (const AliEMCALBiasAPD &);
 
-  ClassDef(AliEMCALBiasAPD, 1) //BiasAPD data reader
+  ClassDef(AliEMCALBiasAPD, 3) //BiasAPD data info
 };
 
 #endif