put in default object which covers the full run range

[u/mrichter/AliRoot.git] / ITS / AliITSv11GeomCableFlat.h

diff --git a/ITS/AliITSv11GeomCableFlat.h b/ITS/AliITSv11GeomCableFlat.h
index 4f8620f93b998347fa4ae30172bb16a66d058888..4aae7711bb7ab9649cc1d20dc4d2def11a5fc45f 100644 (file)
--- a/ITS/AliITSv11GeomCableFlat.h
+++ b/ITS/AliITSv11GeomCableFlat.h
@@ -12,9 +12,7 @@
 
 class TGeoVolume;
 class TGeoTranslation;
-//class TGeoCombiTrans;
-//class TGeoArb8;
-//class TGeoNode;
+class TGeoCombiTrans;
 class TGeoMedium;
 
 #include "AliITSv11GeomCable.h"
@@ -24,19 +22,23 @@ class AliITSv11GeomCableFlat : public AliITSv11GeomCable {
  public:
   AliITSv11GeomCableFlat();
   AliITSv11GeomCableFlat(const char* name, Double_t width, Double_t thick);
-  AliITSv11GeomCableFlat(const AliITSv11GeomCableFlat &source);
-  AliITSv11GeomCableFlat& operator=(const AliITSv11GeomCableFlat &source);
   virtual ~AliITSv11GeomCableFlat() {};
 
-  void     SetNLayers(Int_t nLayers);
-  Int_t    SetLayer(Int_t nLayer,Double_t thick,TGeoMedium *medium,Int_t color=0);
-  void     AddCheckPoint( TGeoVolume *vol, Int_t iCheckPt,
-                       Double_t *coord, Double_t *orthVect);
-  Int_t    CreateAndInsertCableSegment(Int_t p2, Double_t rotation=0);
-  void     SetWidth(Double_t width) { fWidth = width;};
-  void     SetThickness(Double_t thick) {fThick = thick;};
-  Double_t GetWidth() const {return fWidth;};
-  Double_t GetThickness() const {return fThick;};
+  void        SetNLayers(Int_t nLayers);
+  Int_t       SetLayer(Int_t nLayer,Double_t thick,TGeoMedium *medium,Int_t color=0);
+  void        AddCheckPoint( TGeoVolume *vol, Int_t iCheckPt,
+                            Double_t *coord, Double_t *orthVect);
+  TGeoVolume* CreateAndInsertCableSegment(Int_t p2, Double_t rotation=0,
+                                         TGeoCombiTrans** ct=0);
+  TGeoVolume* CreateAndInsertBoxCableSegment(Int_t p2, Double_t rotation=0,
+                                            TGeoCombiTrans** ct=0);
+  TGeoVolume* CreateAndInsertCableCylSegment(Int_t p2, Double_t rotation=0,
+                                            TGeoCombiTrans** ct=0);
+
+  void        SetWidth(Double_t width) { fWidth = width;};
+  void        SetThickness(Double_t thick) {fThick = thick;};
+  Double_t    GetWidth() const {return fWidth;};
+  Double_t    GetThickness() const {return fThick;};
 
   virtual void  PrintCheckPoints() const;
   virtual Int_t GetPoint(Int_t iCheckPt, Double_t *coord) const;
@@ -46,6 +48,10 @@ class AliITSv11GeomCableFlat : public AliITSv11GeomCable {
   TGeoVolume *CreateSegment( Double_t *coord1,Double_t *coord2,
                             Double_t *localVect1, Double_t *localVect2 );
 
+  TGeoVolume *CreateBoxSegment( Double_t *coord1,Double_t *coord2);
+
+  TGeoVolume *CreateCylSegment( Double_t &phi, Double_t &r);
+
   Double_t  fWidth;                                 // width
   Double_t  fThick;                                 // total thickness
   Int_t     fNlayer;                                // number of layers
@@ -55,6 +61,10 @@ class AliITSv11GeomCableFlat : public AliITSv11GeomCable {
   TGeoMedium      *fLayMedia[fgkCableMaxLayer];     // layer media
   Int_t            fLayColor[fgkCableMaxLayer];     // layer colors
 
+ private:
+  AliITSv11GeomCableFlat(const AliITSv11GeomCableFlat &source);
+  AliITSv11GeomCableFlat& operator=(const AliITSv11GeomCableFlat &source);
+
   ClassDef(AliITSv11GeomCableFlat,1)
 };