Fix for ESD analysis

[u/mrichter/AliRoot.git] / TOF / AliTOFv6T0.h

diff --git a/TOF/AliTOFv6T0.h b/TOF/AliTOFv6T0.h
index 5333ff126b75735ef95a573751befd40d4b8d3aa..f61411fe5b6a9f81cccbba43d6c68bfaa0e58ac1 100644 (file)
--- a/TOF/AliTOFv6T0.h
+++ b/TOF/AliTOFv6T0.h
@@ -1,5 +1,5 @@
-#ifndef ALITOFv6T0_H
-#define ALITOFv6T0_H
+#ifndef ALITOFV6T0_H
+#define ALITOFV6T0_H
 /* Copyright(c) 1998-1999, ALICE Experiment at CERN, All rights reserved. *
  * See cxx source for full Copyright notice                               */
 
@@ -21,7 +21,6 @@ public:
   AliTOFv6T0();
   AliTOFv6T0(const char *name, const char *title);
   virtual ~AliTOFv6T0() {};
-  virtual void   BuildGeometry();
   virtual void   CreateGeometry();
   virtual void   CreateMaterials();
   virtual void   Init();
@@ -31,13 +30,11 @@ public:
   virtual void   TOFpc(Float_t, Float_t, Float_t, Float_t) {};
   virtual void   TOFpc(Float_t, Float_t, Float_t, Float_t, Float_t, Float_t) {};
   virtual void   StepManager();
-  virtual void   DrawModule() const;
-  virtual void   DrawDetectorModules() const;
-  virtual void   DrawDetectorStrips() const;
  
  protected:
 
-  void MaterialMixer(Float_t* p,Float_t* a,Float_t* m,Int_t n) const;
+  void MaterialMixer(Float_t * p, const Float_t * const a,
+                    const Float_t * const m, Int_t n) const;
 
 private:
 
@@ -46,9 +43,9 @@ private:
   void MakeStripsInModules(Float_t ytof, Float_t zlenA) const;
   void CreateModuleCovers(Float_t xtof, Float_t zlenA) const;
   void CreateBackZone(Float_t xtof, Float_t ytof, Float_t zlenA) const;
-  void MakeFrontEndElectronics() const;
-  void MakeFEACooling(Float_t xtof, Float_t ytof, Float_t zlenA) const;
-  void MakeNinoMask(Float_t xtof, Float_t ytof, Float_t zlenA) const;
+  void MakeFrontEndElectronics(Float_t xtof) const;
+  void MakeFEACooling(Float_t xtof) const;
+  void MakeNinoMask(Float_t xtof) const;
   void MakeSuperModuleCooling(Float_t xtof, Float_t ytof, Float_t zlenA) const;
   void MakeSuperModuleServices(Float_t xtof, Float_t ytof, Float_t zlenA) const;
   void MakeModulesInBTOFvolumes(Float_t ytof, Float_t zlenA) const;
@@ -62,10 +59,11 @@ private:
   Int_t fIdFLTA; // FLTA volume identifier (inner plate A)
   Int_t fIdFLTB; // FLTB volume identifier (inner plate B)
   Int_t fIdFLTC; // FLTC volume identifier (inner plate C)
-  Bool_t fTOFHoles; // Selecting Geometry with and w/o holes
- 
+
   //private:
 
+  static const Bool_t fgkFEAwithMasks[18]; // Selecting TOF sectors containing FEA cooling masks
+
   static const Float_t fgkModuleWallThickness;  // wall thickness (cm)
   static const Float_t fgkInterCentrModBorder1; // 1st distance of
                                                // border between
@@ -95,10 +93,20 @@ private:
                                                // modules respect to
                                                // the central module
                                                // centre (cm)
+  /*
   static const Float_t fgkLengthInCeModBorder;  // height of border
                                                // between the central
                                                // and intermediate
                                                // modules (cm)
+                                               */
+  static const Float_t fgkLengthInCeModBorderU; // height of upper border
+                                               // between the central
+                                               // and intermediate
+                                               // modules (cm)
+  static const Float_t fgkLengthInCeModBorderD; // height of lower border
+                                               // between the central
+                                               // and intermediate
+                                               // modules (cm)
   static const Float_t fgkLengthExInModBorder;  // height of border
                                                // between the
                                                // intermediate and
@@ -119,8 +127,24 @@ private:
                                 // (cm)
   static const Float_t fgkCBLh2; // max. height of cables&tubes block
                                 // (cm)
+  static const Float_t fgkBetweenLandMask; // distance between the L
+                                          // element and the Nino
+                                          // mask (cm)
+  static const Float_t fgkAl1parameters[3]; // (cm)
+  static const Float_t fgkAl2parameters[3]; // (cm)
+  static const Float_t fgkAl3parameters[3]; // (cm)
+  static const Float_t fgkRoof1parameters[3]; // (cm)
+  static const Float_t fgkRoof2parameters[3]; // (cm)
+  static const Float_t fgkFEAparameters[3]; // (cm)
+  //static const Float_t fgkFCAparameters[3]; // (cm)
+  static const Float_t fgkBar[3]; // (cm)
+  static const Float_t fgkBar1[3]; // (cm)
+  static const Float_t fgkBar2[3]; // (cm)
+  static const Float_t fgkBarS[3]; // (cm)
+  static const Float_t fgkBarS1[3]; // (cm)
+  static const Float_t fgkBarS2[3]; // (cm)
 
-  ClassDef(AliTOFv6T0,0)  //Time Of Flight version 6
+  ClassDef(AliTOFv6T0,1)  //Time Of Flight version 6
 };
  
-#endif /* ALITOFv6T0_H */
+#endif /* ALITOFV6T0_H */