added alignables for v1, fixed in v0

[u/mrichter/AliRoot.git] / ITS / UPGRADE / AliITSUv0.h

diff --git a/ITS/UPGRADE/AliITSUv0.h b/ITS/UPGRADE/AliITSUv0.h
index cb1cedef25a942388f894a98dffe1e277c795575..877c690feaaa691e3f015906ee9a1a3cc45cfc67 100644 (file)
--- a/ITS/UPGRADE/AliITSUv0.h
+++ b/ITS/UPGRADE/AliITSUv0.h
@@ -17,16 +17,6 @@
 
 #include "AliITSU.h"
 
-typedef enum {
-  kModelDummy=0,
-  kModel0=1,
-  kModel1=2, 
-  kModel21=3,
-  kModel22=4,
-  kModel3=5,
-} AliITSUModel_t;
-
-
 class  AliITSUv0Layer;
 //class  AliITSv11GeomBeamPipe;
 class  TGeoVolume;
@@ -35,48 +25,69 @@ class  TGeoVolumeAssembly;
 class AliITSUv0 : public AliITSU {
 
  public:
+
+
+  typedef enum {
+    kModelDummy=0,
+    kModel0=1,
+    kModel1=2, 
+    kModel21=3,
+    kModel22=4,
+    kModel3=5
+  } AliITSUModel_t;
+  
+
   AliITSUv0();
   AliITSUv0(const char *title, const Int_t nlay);
   virtual       ~AliITSUv0() ;
-  
+  virtual void   SetNWrapVolumes(Int_t n);
   virtual void   AddAlignableVolumes() const;
   virtual void   CreateGeometry();
   virtual void   CreateMaterials();
-  virtual void   DefineLayer(Int_t nlay,Double_t phi0,Double_t r,Double_t zlen,Int_t nladd,
+  virtual void   DefineLayer(Int_t nlay,Double_t phi0,Double_t r,Double_t zlen,Int_t nstav,
                             Int_t nmod, Double_t lthick=0.,Double_t dthick=0.,UInt_t detType=0);
-  virtual void   DefineLayerTurbo(Int_t nlay,Double_t phi0,Double_t r,Double_t zlen,Int_t nladd,
+  virtual void   DefineLayerTurbo(Int_t nlay,Double_t phi0,Double_t r,Double_t zlen,Int_t nstav,
                                  Int_t nmod,Double_t width,Double_t tilt,
                                  Double_t lthick = 0.,Double_t dthick = 0.,UInt_t detType=0, Int_t buildFlag=0);
   virtual void   GetLayerParameters(Int_t nlay, Double_t &phi0,Double_t &r, Double_t &zlen,
-                                   Int_t &nladd, Int_t &nmod,
+                                   Int_t &nstav, Int_t &nmod,
                                    Double_t &width, Double_t &tilt,
                                    Double_t &lthick, Double_t &mthick,
                                    UInt_t &dettype) const;
+  virtual void   DefineWrapVolume(Int_t id, Double_t rmin,Double_t rmax, Double_t zspan);
   virtual void   Init(); 
   virtual Bool_t IsLayerTurbo(Int_t nlay);
   virtual Int_t  IsVersion()                 const { return 20;}  // vUpgrade ? do we need this
   virtual void   SetDefaults();
   virtual void   StepManager();
-  virtual void   SetLayerDetTypeID(Int_t lr, UInt_t id);
-  virtual Int_t  GetLayerDetTypeID(Int_t lr);
+  virtual void   SetLayerChipTypeID(Int_t lr, UInt_t id);
+  virtual Int_t  GetLayerChipTypeID(Int_t lr);
   virtual void   SetStaveModel(AliITSUModel_t model) {fStaveModel=model;}
   virtual AliITSUModel_t GetStaveModel() const {return fStaveModel;}
   //
  private:
   AliITSUv0(const AliITSUv0 &source); // copy constructor
   AliITSUv0& operator=(const AliITSUv0 &source); // assignment operator
+
+  TGeoVolume* CreateWrapperVolume(const Int_t nLay);
+
   //
+  Int_t     fNWrapVol;       // number of wrapper volumes
+  Double_t* fWrapRMin;       // min radius of wrapper volume
+  Double_t* fWrapRMax;       // max radius of wrapper volume
+  Double_t* fWrapZSpan;      // Z span of wrapper volume
+  Int_t*    fLay2WrapV;      // id of wrapper layer to which layer belongs (-1 if not wrapped)
   Bool_t   *fLayTurbo;       // True for "turbo" layers
-  Double_t *fLayPhi0;        // Vector of layer's 1st ladder phi in lab
+  Double_t *fLayPhi0;        // Vector of layer's 1st stave phi in lab
   Double_t *fLayRadii;       // Vector of layer radii
   Double_t *fLayZLength;     // Vector of layer length along Z
-  Int_t    *fLaddPerLay;     // Vector of number of ladders per layer
-  Int_t    *fModPerLadd;     // Vector of number of modules per ladder
-  Double_t *fLadThick;       // Vector of ladder thicknesses
-  Double_t *fLadWidth;       // Vector of ladder width (only used for turbo)
-  Double_t *fLadTilt;        // Vector of ladder tilt (only used for turbo)
+  Int_t    *fStavPerLay;     // Vector of number of staves per layer
+  Int_t    *fModPerStav;     // Vector of number of chips per stave
+  Double_t *fStaThick;       // Vector of stave thicknesses
+  Double_t *fStaWidth;       // Vector of stave width (only used for turbo)
+  Double_t *fStaTilt;        // Vector of stave tilt (only used for turbo)
   Double_t *fDetThick;       // Vector of detector thicknesses
-  UInt_t   *fDetTypeID;      // Vector of detector type id
+  UInt_t   *fChipTypeID;      // Vector of detector type id
   Int_t    *fBuildLevel;     // Vector of Material Budget Studies
   //  
   AliITSUv0Layer **fUpGeom; //! Geometry