Bug fix

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

diff --git a/ITS/AliITSvSSD03.h b/ITS/AliITSvSSD03.h
index 7503229d321e53fa94429172c1377ac6b56f6fca..eb3fead27aea3398c6465d2c0b5e49b768090baf 100644 (file)
--- a/ITS/AliITSvSSD03.h
+++ b/ITS/AliITSvSSD03.h
@@ -7,6 +7,7 @@
 // ITS step manager and geometry class for the ITS SSD test beam geometry //
 // of june 2003.                                                          //
 ////////////////////////////////////////////////////////////////////////////
+#include "AliITSInitGeometry.h"
 #include "AliITS.h"
 
 class AliITSvSSD03 : public AliITS{
@@ -18,9 +19,9 @@ class AliITSvSSD03 : public AliITS{
     virtual void   CreateGeometry();
     virtual void   CreateMaterials();
     virtual Int_t  IsVersion() const {// returns the ITS version number 
-                                      return 1;} 
+                                      return (Int_t)kvSSD03;} 
     virtual void   Init();
-    virtual void   SetDefaults();
+    //virtual void   SetDefaults();
     virtual void   DrawModule() const;
     virtual void   StepManager(); 
     virtual void   SetWriteDet(Bool_t det=kTRUE){ // set .det write
@@ -36,21 +37,9 @@ class AliITSvSSD03 : public AliITS{
     virtual void   SetEUCLIDFileName(const char *f){ // set write file
                              fEuclidGeometry=f;fEuclidOut = kTRUE;}
     virtual void   SetMinorVersion(Int_t v=22){ // Choose between existing minor versions
-        fMinorVersion = v;} 
-    virtual void   SetThicknessDet1(Float_t v=300.){
-         // Set detector thickness in layer 1
-         fDet1 = v;}
-    virtual void   SetThicknessDet2(Float_t v=300.){
-         // Set detector thickness in layer 2
-         fDet2 = v;}
-    virtual void   SetThicknessChip1(Float_t v=300.){
-         // Set chip thickness in layer 1
-         fChip1 = v;}
-    virtual void   SetThicknessChip2(Float_t v=300.){
-         // Set chip thickness in layer 2
-         fChip2 = v;}
+        fMinorVersion = v;}
     // Replacement default simulation initilization.
-    virtual void SetDefaultSimulation();
+    //virtual void SetDefaultSimulation();
     //
   private:
     void BuildGeometry2003();
@@ -60,7 +49,6 @@ class AliITSvSSD03 : public AliITS{
  private:  
     AliITSvSSD03(const AliITSvSSD03 &source); // Copy constructor
     AliITSvSSD03& operator=(const AliITSvSSD03 &source); // = operator
-    void InitAliITSgeom();
     Bool_t fGeomDetOut;       // Flag to write .det file out
     Bool_t fGeomDetIn;        // Flag to read .det file or directly from Geat.
     Int_t  fMajorVersion;     // Major version number == IsVersion
@@ -69,12 +57,9 @@ class AliITSvSSD03 : public AliITS{
     char   fEuclidGeomDet[60];// file where detector transormation are define.
     char   fRead[60];         //! file name to read .det file
     char   fWrite[60];        //! file name to write .det file 
-    Float_t  fDet1;           // thickness of detector in SSD layer 1
-    Float_t  fDet2;           // thickness of detector in SSD layer 2
-    Float_t  fChip1;          // thickness of chip in SSD layer 1
-    Float_t  fChip2;          // thickness of chip in SSD layer 2 
-    Int_t fIDMother;          //! ITS Mother Volume id.
+    Int_t  fIDMother;         //! ITS Mother Volume id.
+    AliITSInitGeometry fIgm;  //! AliITSInitGeometry object
 
-    ClassDef(AliITSvSSD03,2) // Hits manager and geometry for SSD testbeam
+    ClassDef(AliITSvSSD03,3) // Hits manager and geometry for SSD testbeam
 };
 #endif