Fixing the wrapper volumes

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

diff --git a/ITS/AliITSInitGeometry.h b/ITS/AliITSInitGeometry.h
index 6b24e57a9908a2cd182cf3c5dc540e68c67fe2d6..4da8e3bce7a47f07f764b65dadaeff558effb77d 100644 (file)
--- a/ITS/AliITSInitGeometry.h
+++ b/ITS/AliITSInitGeometry.h
@@ -29,22 +29,20 @@ class AliITSInitGeometry : public TObject{
  public:
 
     AliITSInitGeometry();//Default Constructor
-    AliITSInitGeometry(AliITSVersion_t version,
-                      Int_t minorversion=2);//Standard Constructor
+    AliITSInitGeometry(AliITSVersion_t version);//Standard Constructor
     //virtual ~AliITSInitGeometry(); // Destructor
     //
     // Create and initialize geometry from TGeo
     AliITSgeom* CreateAliITSgeom();
-    AliITSgeom* CreateAliITSgeom(Int_t major,Int_t minor); 
+    AliITSgeom* CreateAliITSgeom(Int_t major); 
     Bool_t InitAliITSgeom(AliITSgeom *geom);//Initilize geometry from gGeoManager
     // Getters and Setters
     // Getters and Setters
-    void    SetVersion(AliITSVersion_t maj,Int_t min) {// Set Major and Minor versions
-        fMajorVersion=maj;fMinorVersion=min;}
+    void    SetVersion(AliITSVersion_t maj) {// Set version
+        fMajorVersion=maj;}
     TString GetGeometryName()const {return fName;}// Return geometry name
     void    SetGeometryName(const Char_t *name){fName = name;}// Set Geometry name
     Int_t   GetMajorVersion()const {return (Int_t)fMajorVersion;} // Return geometry major version
-    Int_t   GetMinorVersion()const{return fMinorVersion;}// Return geometry minor version
     Bool_t  GetTiming()const{return fTiming;} // return routine timing flag
     void    SetTiming(Bool_t time=kTRUE){fTiming=time;}// Set routine timing (on)
     Bool_t  GetSegGeom()const{return fSegGeom;} // return flag indecating the use of AliITSsegmentation or AliITSgeomS?D class in fShape.
@@ -62,27 +60,14 @@ class AliITSInitGeometry : public TObject{
                         Int_t cpn1,Int_t cpn2) const;
     // Given module number, find copy numbers.
     void RecodeDetector(Int_t mod,Int_t &cpn0,Int_t &cpn1,Int_t &cpn2);
-   // fills the string str with the major and minor version number
+   // fills the string str with the version number
     Bool_t WriteVersionString(Char_t *str,Int_t length,
-                              AliITSVersion_t maj,Int_t min,
-                              const Char_t *cvsDate,const Char_t *cvsRev)const;
-    // decodes the string str with the major and minor version number
-    Bool_t ReadVersionString(const Char_t *str,Int_t length,
-                             AliITSVersion_t &maj,Int_t &min,TDatime &dt)const;
-
-    static Bool_t SPDIsTGeoNative() {return !fgkOldSPDbarrel;}
-    static Bool_t SDDIsTGeoNative() {return !fgkOldSDDbarrel;}
-    static Bool_t SSDIsTGeoNative() {return !fgkOldSSDbarrel;}
-
-    static Bool_t SDDconeIsTGeoNative()   {return ! fgkOldSDDcone;} 
-    static Bool_t SSDconeIsTGeoNative()   {return ! fgkOldSSDcone;}
-    static Bool_t SPDshieldIsTGeoNative() {return ! fgkOldSPDshield;}
-    static Bool_t SDDshieldIsTGeoNative() {return ! fgkOldSDDshield; }
-    static Bool_t SSDshieldIsTGeoNative() {return ! fgkOldSSDshield;}
-    static Bool_t ServicesAreTGeoNative() {return ! fgkOldServices;}
-    static Bool_t SupportIsTGeoNative()   {return ! fgkOldSupports;}
+                              AliITSVersion_t maj)const;
 
  private:
+    // decodes the string str with the version number
+    Bool_t ReadVersionString(const Char_t *str,AliITSVersion_t &maj)const;
+
     // Decode module number into old layer, ladder, and detector numbers
     void DecodeDetectorLayersv11(Int_t mod,Int_t &lay,
                                 Int_t &lad,Int_t &det);
@@ -99,7 +84,6 @@ class AliITSInitGeometry : public TObject{
     void TransposeTGeoHMatrix(TGeoHMatrix *m) const;
 
     TString         fName;         // Geometry name
-    Int_t           fMinorVersion; // Geometry minor version
     AliITSVersion_t fMajorVersion; // Geometry swich value
     Bool_t          fTiming;       // Flag to start inilization timing
     Bool_t          fSegGeom;      // Flag to switch between the old use of
@@ -108,16 +92,6 @@ class AliITSInitGeometry : public TObject{
     Bool_t          fDecode;       // Flag for new/old decoding
     Int_t           fDebug;        // Debug flag
 
-    static const Bool_t fgkOldSPDbarrel;   // use old geo for SPD ?
-    static const Bool_t fgkOldSDDbarrel;   // use old geo for SDD ?
-    static const Bool_t fgkOldSSDbarrel;   // use old geo for SSD ?
-    static const Bool_t fgkOldSDDcone;    // use old geo for SDD cone ?
-    static const Bool_t fgkOldSSDcone;    // use old geo for SSD cone?
-    static const Bool_t fgkOldSPDshield;  // use old geo for SPD shield ?
-    static const Bool_t fgkOldSDDshield;  // use old geo for SDD shield ?
-    static const Bool_t fgkOldSSDshield;  // use old geo for SDD shield ?
-    static const Bool_t fgkOldServices;  // use old geo for services ?
-    static const Bool_t fgkOldSupports;  // use old geo for supports ?
 
     ClassDef(AliITSInitGeometry,0) // create/Init AliITSgeom
     // 0 in ClassDef indicates that this class will not be "saved" in a file.