Updated beampipe from Mario Sitta

[u/mrichter/AliRoot.git] / STRUCT / AliPIPEupgrade.h

diff --git a/STRUCT/AliPIPEupgrade.h b/STRUCT/AliPIPEupgrade.h
index 2cc9e40b03bbfd612c01a663d22d5bdcdb42aed9..9f42a369fb7356abfb6616e7c1d22fa31b09f462 100644 (file)
--- a/STRUCT/AliPIPEupgrade.h
+++ b/STRUCT/AliPIPEupgrade.h
@@ -24,9 +24,9 @@ class AliPIPEupgrade : public AliPIPE {
   enum constants {kC=6, kAlu=9, kInox=19, kGetter=20, kBe=5, kVac=16,
                  kAir=15, kAlBe=21, kPA = 22};
   
-  AliPIPEupgrade(Bool_t coneIsBe=0, Float_t ro=1.8, Float_t width=0.08, Float_t hlength=61.52);
+  AliPIPEupgrade(Float_t ro=-1, Float_t thick=-1);
   AliPIPEupgrade(const char *name, const char *title, 
-                Bool_t coneIsBe=0, Float_t ro=1.8, Float_t width=0.08, Float_t hlength=61.52);
+                Float_t ro=-1, Float_t thick=-1);
   AliPIPEupgrade(Option_t *opt);
   // virtual       ~AliPIPEupgrade() {}
   virtual void   CreateGeometry();
@@ -35,23 +35,24 @@ class AliPIPEupgrade : public AliPIPE {
   virtual void   SetBeamBackgroundSimulation() {fBeamBackground = kTRUE;}
   virtual void   AddAlignableVolumes() const;
   
-  Float_t GetRmin() {return fIpPipeRo-fIpPipeWidth; }
-  Float_t GetRmax() {return fIpPipeRo; }
-  Float_t GetWidth(){return fIpPipeWidth; }
+  Float_t GetRmin() {return fBePipeRmax-fBePipeThick; }
+  Float_t GetRmax() {return fBePipeRmax; }
+  Float_t GetWidth(){return fBePipeThick; }
   Float_t GetDz()   {return fIpHLength; } 
          
  protected:
   virtual TGeoPcon*   MakeMotherFromTemplate(const TGeoPcon* shape, Int_t imin = -1, Int_t imax = -1, Float_t r0 = 0., Int_t nz =-1);
   virtual TGeoPcon*   MakeInsulationFromTemplate(TGeoPcon* shape);
   virtual TGeoVolume* MakeBellow(const char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t dU, Float_t rPlie, Float_t dPlie);
+  virtual TGeoVolume* MakeBellowCside(const char* ext, Int_t nc, Float_t rMin, Float_t rMax, Float_t rPlie, Float_t dPlie);
+
   Bool_t  fBeamBackground; // Flag for beam background simulations
-  
   Bool_t  fConeIsBe;         // Flag for Material of the "long cone", can be set to Be (std is Alu)
-  Float_t fIpPipeRo;         // outer diameter of the beampipe around the IP
-  Float_t fIpPipeWidth;      // width of the beampipe around the IP
+  Float_t fBePipeRmax;       // outer diameter of the Be section
+  Float_t fBePipeThick;      // Be section thickness 
   Float_t fIpHLength;        // half length of the beampipe around the IP // FixMe: up to now, hardcoded to 57.25cm
  
-  ClassDef(AliPIPEupgrade, 1)  // Class for PIPE version using TGeo
+  ClassDef(AliPIPEupgrade, 2)  // Class for PIPE version using TGeo
 };
  
 #endif