Changes for report #69974: Virtual class for calorimeter analysis objects

[u/mrichter/AliRoot.git] / STEER / AliESDCaloCells.h

diff --git a/STEER/AliESDCaloCells.h b/STEER/AliESDCaloCells.h
index 69057c3f2712f43720d585696cc47035ce8e1369..28463c0626bac164b67ac3f2a95430259d154d1d 100644 (file)
--- a/STEER/AliESDCaloCells.h
+++ b/STEER/AliESDCaloCells.h
@@ -13,28 +13,24 @@
 //-------------------------------------------------------------------------
 
 
-#include <TNamed.h>
+#include <AliVCaloCells.h>
 #include <TMath.h>
 
-class AliESDCaloCells : public TNamed
+class AliESDCaloCells : public AliVCaloCells
 {
  public:
 
-  enum ESDCells_t {kUndef = -1, 
-                  kPHOSCell, 
-                  kEMCALCell};
-
   AliESDCaloCells();
-  AliESDCaloCells(const char* name, const char* title, ESDCells_t ttype=kUndef);
+  AliESDCaloCells(const char* name, const char* title, VCells_t ttype=kUndef);
   AliESDCaloCells(const AliESDCaloCells & cells);
   AliESDCaloCells & operator=(const AliESDCaloCells& source);
   virtual ~AliESDCaloCells();
   virtual void Copy(TObject &obj) const;
   
-  Bool_t IsEMCAL() const {return (fType == kEMCALCell);}
-  Bool_t IsPHOS() const {return (fType == kPHOSCell);}
-  Char_t  GetType() const { return fType;}
-  void    SetType(ESDCells_t ttype) { fType=ttype; }
+  Bool_t IsEMCAL()  const { return (fType == kEMCALCell);}
+  Bool_t IsPHOS()   const { return (fType == kPHOSCell) ;}
+  Char_t  GetType() const { return  fType;}
+  void    SetType(Char_t ttype) { fType = ttype; }
 
   void CreateContainer(Short_t nCells);
   void DeleteContainer();
@@ -52,15 +48,16 @@ class AliESDCaloCells : public TNamed
   inline Short_t  GetCellNumber(Short_t pos) const;
 
 
+
  protected:
   Int_t       fNCells;       // Number of cells
   Short_t    *fCellNumber;   //[fNCells] array of cell numbers
   Double32_t *fAmplitude;    //[fNCells][0.,0.,16] array with cell amplitudes (= energy!)
-  Double32_t *fTime;    //[fNCells][0.,0.,16] array with cell times
+  Double32_t *fTime;         //[fNCells][0.,0.,16] array with cell times
   Bool_t      fIsSorted;     //! true if cell arrays are sorted by index
   Char_t      fType;         // Cell type
 
-  ClassDef(AliESDCaloCells, 1);
+  ClassDef(AliESDCaloCells, 2);
 };
 
 
@@ -140,5 +137,4 @@ Short_t AliESDCaloCells::GetCellNumber(Short_t pos) const
   }
 }
 
-
 #endif