Reverting change 49889

[u/mrichter/AliRoot.git] / PMD / AliPMDv1.h

diff --git a/PMD/AliPMDv1.h b/PMD/AliPMDv1.h
index b3cb49b7f99ca7253da9babef5e9bcc9566ade13..1fd082fd8e1409310ea1dd9428e375cac99222ed 100644 (file)
--- a/PMD/AliPMDv1.h
+++ b/PMD/AliPMDv1.h
@@ -6,12 +6,12 @@
 /* $Id$ */
 // Rectangular geometry - Bedanga Mohanty - Spetember 2003
 
-////////////////////////////////////////////////
+/////////////////////////////////////////////////
 //  Manager and hits classes for set:PMD      //
 ////////////////////////////////////////////////
  
 #include "AliPMD.h"
-
+#include "TGeoManager.h"
 //___________________________________________
  
 class AliPMDv1 : public AliPMD {
@@ -28,7 +28,11 @@ public:
   virtual void  Init();
   virtual Int_t IsVersion() const {return 1;}
   virtual void  StepManager();
-  virtual void  DrawModule() const;
+  virtual void  AddAlignableVolumes() const;
+  void          SetSectorAlignable() const;
+  void          SetCpvOff();
+  void          SetPreOff();
+  void          SetModuleOff(Int_t imodule);
 
 private:
 
@@ -39,9 +43,6 @@ private:
   static const Float_t fgkCellRadius;    // Radius of a hexagonal cell
   static const Float_t fgkCellWall;      // Thickness of cell Wall
   static const Float_t fgkCellDepth;     // Gas thickness
-  static const Float_t fgkBoundary;      // Thickness of Boundary wall
-  static const Float_t fgkThBase;        // Thickness of Base plate
-  static const Float_t fgkThAir;         // Thickness of Air
   static const Float_t fgkThPCB;         // Thickness of PCB
   static const Float_t fgkThLead;        // Thickness of Pb
   static const Float_t fgkThSteel;       // Thickness of Steel
@@ -49,8 +50,16 @@ private:
   static const Float_t fgkZdist;         // z-position of the detector
   static const Float_t fgkSqroot3;       // Square Root of 3
   static const Float_t fgkSqroot3by2;    // Square Root of 3 by 2
+  static const Float_t fgkSSBoundary;
+  static const Float_t fgkThSS ;
+  static const Float_t fgkThTopG10;
+  static const Float_t fgkThBotG10;
 
-  Float_t fSMthick;     // Thickness of the supermodule
+  Int_t   fModStatus[48];
+
+  Float_t fSMthick;     // Thickness of the full PMD profile
+  Float_t fSMthickpmd;  // Thickness of the PMD detector only
+  Float_t fDthick;      // Thickness of the pre/veto module
   Float_t fSMLengthax;  // Supermodule length along X, type A
   Float_t fSMLengthay;  // Supermodule length along Y, type A
   Float_t fSMLengthbx;  // Supermodule length along X, type B
@@ -60,8 +69,9 @@ private:
   Float_t fDboxmm12[3]; // Master MODULE EMCA of aluminum for CPV
   Float_t fDboxmm2[3];  // Master MODULE EMPB of aluminum for PMD
   Float_t fDboxmm22[3]; // Master MODULE EMCB of aluminum for CPV
+
  
-  ClassDef(AliPMDv1,1)     //Hits manager for set:PMD
+  ClassDef(AliPMDv1,4)     //Hits manager for set:PMD
 };
  
 #endif