Typo corrected.

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

diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h
index c77227eb965573f1de65cc0154a45aedb82505bb..946dcbd63208a1a1f796081ec0dfcdaa2c5e0a91 100644 (file)
--- a/EMCAL/AliEMCALGeometry.h
+++ b/EMCAL/AliEMCALGeometry.h
@@ -25,8 +25,10 @@ class AliEMCALRecPoint;
 class TClonesArray ;
 
 // --- AliRoot header files ---
+#include <TArrayD.h>
+#include <TMath.h>
+
 #include "AliGeometry.h"
-#include "TArrayD.h"
 
 class AliEMCALGeometry : public AliGeometry {
 public:
@@ -35,18 +37,19 @@ public:
 
   static AliEMCALGeometry * GetInstance(const Text_t* name,
                                        const Text_t* title="") ; 
-  static AliEMCALGeometry * GetInstance() ;
+  static AliEMCALGeometry * GetInstance();
   AliEMCALGeometry & operator = (const AliEMCALGeometry  & /*rvalue*/) {
     // assignement operator requested by coding convention but not needed
     Fatal("operator =", "not implemented");
     return *this;
   };
+  static Char_t* GetDefaulGeometryName() {return fgDefaultGeometryName;}
   void PrintGeometry();                                           //*MENU*  
   void PrintCellIndexes(Int_t absId=0, int pri=0, char *tit="");  //*MENU*
   virtual void Browse(TBrowser* b);
   virtual Bool_t  IsFolder() const;
 
-  void FillTRU(const TClonesArray * digits, TClonesArray * amptru, TClonesArray * timeRtru)  ; //Fills Trigger Unit matrices with digit amplitudes and time
+  void FillTRU(const TClonesArray * digits, TClonesArray * amptru, TClonesArray * ampmod, TClonesArray * timeRtru)  ; //Fills Trigger Unit matrices with digit amplitudes and time
   void GetCellPhiEtaIndexInSModuleFromTRUIndex(Int_t itru, Int_t iphitru, Int_t ietatru, Int_t &ietaSM, Int_t &iphiSM) const ; // Tranforms Eta-Phi Cell index in TRU into Eta-Phi index in Super Module
   
   // Have to call GetTransformationForSM() before calculation global charachteristics 
@@ -203,6 +206,8 @@ public:
   Int_t GetNCellsInSupMod() const {return fNCellsInSupMod;}
   Int_t GetNCellsInModule()  const {return fNCellsInModule; }
   Int_t GetKey110DEG()      const {return fKey110DEG;}
+  Int_t GetILOSS() const {return fILOSS;}
+  Int_t GetIHADR() const {return fIHADR;}
 
   AliEMCALGeometry(); // default ctor only for internal usage (singleton)
 
@@ -215,7 +220,8 @@ protected:
   
 private:
   static AliEMCALGeometry * fgGeom;    // pointer to the unique instance of the singleton
-  static Bool_t fgInit;                        // Tells if geometry has been succesfully set up.
+  static Bool_t  fgInit;               // Tells if geometry has been succesfully set up.
+  static Char_t* fgDefaultGeometryName; // Default name of geometry
 
   TString fGeoName;                     //geometry name
 
@@ -291,8 +297,12 @@ private:
   Float_t     fParSM[3];       // SM sizes as in GEANT (TRD1)
   TGeoMatrix* fMatrixOfSM[12]; //![fNumberOfSuperModules]; get from gGeoManager;
 
-  char *fAdditionalOpts[4];  //! some additional options for the geometry type and name
-  int  fNAdditionalOpts;  //! size of additional options parameter
+  char *fAdditionalOpts[6];  //! some additional options for the geometry type and name
+  int  fNAdditionalOpts;     //! size of additional options parameter
+
+  // Options for Geant (MIP business) - will call in AliEMCAL
+  Int_t fILOSS;
+  Int_t fIHADR;
 
   ClassDef(AliEMCALGeometry, 11) // EMCAL geometry class 
   };