filter out additional compile defines to fit into rootcints 1024 char limit

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

diff --git a/EMCAL/AliEMCALGeometry.h b/EMCAL/AliEMCALGeometry.h
index 529ee21982455a8c1670e4e146e85482a9ecdf5c..2c313886f1922b54e8cb3378e6ff43411e7e9fee 100644 (file)
--- a/EMCAL/AliEMCALGeometry.h
+++ b/EMCAL/AliEMCALGeometry.h
@@ -20,14 +20,20 @@ class TObjArray;
 class TVector3;
 class TGeoMatrix;
 class TParticle ; 
-class AliEMCALGeometry;
-class AliEMCALShishKebabTrd1Module;
-class AliEMCALRecPoint;
 class TClonesArray ;
+#include <TMath.h>
+#include <TArrayD.h>
+class assert;
+class Riostream;
+class TClonesArray;
+class TGeoNode;
+class TGeoManager;
 
 // --- AliRoot header files ---
-#include <TArrayD.h>
-#include <TMath.h>
+class AliEMCALGeometry;
+class AliEMCALShishKebabTrd1Module;
+class AliEMCALRecPoint;
+class AliEMCALDigit;
 
 #include "AliGeometry.h"
 
@@ -47,12 +53,11 @@ public:
   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 void Browse(TBrowser* b) const ;
   virtual Bool_t  IsFolder() const;
 
   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 
   void GetGlobal(const Double_t *loc, Double_t *glob, int ind) const;
   void GetGlobal(const TVector3 &vloc, TVector3 &vglob, int ind) const;
   void GetGlobal(Int_t absId, Double_t glob[3]) const;
@@ -67,13 +72,13 @@ public:
 
   Bool_t GetAbsCellIdFromEtaPhi(Double_t eta,Double_t phi, Int_t &absId) const;
 
-  //  virtual void GetGlobal(const AliEMCALRecPoint *rp, TVector3 &vglob) const;
-
   virtual void GetGlobal(const AliRecPoint *rp, TVector3 &vglob) const;
-  // Bool_t AreInSameTower(Int_t id1, Int_t id2) const ;  
-
-  virtual void GetGlobal(const AliRecPoint *, TVector3 &, TMatrixF &) const {}
-
+  virtual void GetGlobal(const AliRecPoint *rp, TVector3 & gpos, TMatrixF & /* gmat */) const
+               {GetGlobal(rp,gpos); }
+  virtual void GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 &vglob) const;
+  virtual void GetGlobalEMCAL(const AliEMCALRecPoint *rp, TVector3 & gpos, TMatrixF & /* gmat */) const
+               {GetGlobalEMCAL(rp,gpos); }
+  
   virtual Bool_t Impact(const TParticle *) const {return kTRUE;}
 
   Bool_t IsInEMCAL(Double_t x, Double_t y, Double_t z) const;
@@ -144,11 +149,10 @@ public:
   TList  *GetShishKebabTrd1Modules() const {return fShishKebabTrd1Modules;}
   AliEMCALShishKebabTrd1Module *GetShishKebabModule(Int_t neta) const;
 
-  void     GetTransformationForSM();
+  Double_t GetPhiCenterOfSM(Int_t nsupmod) const;
+
   Float_t *GetSuperModulesPars() {return fParSM;}
-  TGeoMatrix *GetTransformationForSM(int i) {
-  if(i>=0 && i<GetNumberOfSuperModules()) return fMatrixOfSM[i]; 
-                                        else return 0;}
+
   // May 31, 2006; ALICE numbering scheme: 
   // see ALICE-INT-2003-038: ALICE Coordinate System and Software Numbering Convention
   // All indexes are stared from zero now.
@@ -304,16 +308,14 @@ private:
   TList *fShishKebabTrd1Modules; //! list of modules
   // Local coordinates of SM for TRD1
   Float_t     fParSM[3];       // SM sizes as in GEANT (TRD1)
-  TGeoMatrix* fMatrixOfSM[12]; //![fNumberOfSuperModules]; get from gGeoManager;
 
   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;
+  Int_t fILOSS; // Options for Geant (MIP business) - will call in AliEMCAL
+  Int_t fIHADR; // Options for Geant (MIP business) - will call in AliEMCAL
 
-  ClassDef(AliEMCALGeometry, 12) // EMCAL geometry class 
+  ClassDef(AliEMCALGeometry, 13) // EMCAL geometry class 
 };
 
 #endif // AliEMCALGEOMETRY_H