finish clean-up of EMCAL geometry

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

diff --git a/EMCAL/AliEMCALCell.h b/EMCAL/AliEMCALCell.h
index a37efd9c5706772dfe863ad2a3e77e42f0de4636..fbfa314e5e7080d555482814558f10abbc9d9a6d 100644 (file)
--- a/EMCAL/AliEMCALCell.h
+++ b/EMCAL/AliEMCALCell.h
@@ -7,10 +7,12 @@
 
 //_________________________________________________________________________
 //  EMCAL cell - keep everyrhing for calibration task     
+//  Initial version was created with TDataSet staf
+//  TObjectSet -> TFolder; Sep 6, 2007
 //                  
 //*-- Author: Aleksei Pavlinov (WSU, Detroit, USA) 
 
-#include <TObjectSet.h>
+#include <TFolder.h>
 
 class TList;
 class TH1;
@@ -20,26 +22,36 @@ class TNtuple;
 class AliEMCALCalibData;
 class AliEMCALCalibCoefs;
 
-class AliEMCALCell : public TObjectSet {
+class AliEMCALCell : public TFolder {
 
  public:
   
-  AliEMCALCell(); 
+  AliEMCALCell(); //default ctor
+  AliEMCALCell(const AliEMCALCell& cell); //copy ctor
   AliEMCALCell(const Int_t absId, const char* title="EMCAL cell");
 
   virtual ~AliEMCALCell();
 
+  AliEMCALCell & operator = (const AliEMCALCell  & /*rvalue*/) {
+    // assignement operator requested by coding convention but not
+    // needed                           
+    Fatal("operator =", "not implemented");
+    return *this;
+  };
+
   void SetCCfromDB(AliEMCALCalibData *ccDb);  // obsolete
   void SetCCfromCCTable(AliEMCALCalibCoefs *t);
 
-  TList*   GetHists() {return (TList*)fObj;}
+  TList*   GetHists() {return fLh;}
+  TObject* GetParent() {return fParent;}
+  void     SetParent(TObject *parent) {fParent=parent;}
   Int_t    GetAbsId()  const {return fAbsId;}
   Int_t    GetSupMod() const {return fSupMod;}
   Int_t    GetModule() const {return fModule;}
 
-  Double_t GetCcIn()  {return  fCcIn;}
-  Double_t GetCcOut() {return  fCcOut;}
-  TF1*     GetFunction() {return fFun;}
+  Double_t GetCcIn()  const {return  fCcIn;}
+  Double_t GetCcOut() const {return  fCcOut;}
+  TF1*     GetFunction() const {return fFun;}
 
   void FillEffMass(const Double_t mgg);
   void FillCellNtuple(TNtuple *nt);
@@ -47,8 +59,11 @@ class AliEMCALCell : public TObjectSet {
   static void FitHist(TH1* h, const char* name="",const char* opt="");
   // Menu
   void FitEffMassHist(const char* opt=""); //*MENU*
-  void Print();                            //*MENU*
+  void PrintInfo();                            //*MENU*
  protected:
+  TObject* fParent; // parent
+  TList* fLh;       // list of hists
+  //
   Int_t fAbsId;   // abs cell id 
   Int_t fSupMod;  // super module number
   Int_t fModule;  // module number inside SM
@@ -58,7 +73,7 @@ class AliEMCALCell : public TObjectSet {
   Int_t fEtaCell; // eta number of cell SM  
   // CC staf
   Double_t fCcIn;  // input  cc in GeV (from Db or table
-  Double_t fCcOut; // output cc  in GeV (from fir now)
+  Double_t fCcOut; // output cc  in GeV (from fit now)
 
   TF1*   fFun;     //! fitting function - gaus + pol2
   //