X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=ITS%2FAliITSvSPD02.h;h=13300e03cb168a905207cd94f3ea97b2bdf74c85;hb=38e61c10bfb7b49309ed0cbd4ee6298b10533cf9;hp=46777f900d9bdd10e4f26ab64efb6ab13a99c765;hpb=6078cf56b5bf4cc7a3c8f55707b1876608670abb;p=u%2Fmrichter%2FAliRoot.git

diff --git a/ITS/AliITSvSPD02.h b/ITS/AliITSvSPD02.h
index 46777f900d9..13300e03cb1 100644
--- a/ITS/AliITSvSPD02.h
+++ b/ITS/AliITSvSPD02.h
@@ -7,37 +7,30 @@
 */
 // ITS step manager and geometry class for the ITS SPD test beam geometry
 // of Summer 2002.
-
+///////////////////////////////////////////////////////////////////////
+// Step manager and 
+// geometry class
+// for the ITS 
+// SPD test beam
+// geometry of summer 2002
+// 
+///////////////////////////////////////////////////////////////////////
+#include "AliITSInitGeometry.h"
 #include "AliITS.h"
 
 class AliITSvSPD02 : public AliITS{
  public:
     AliITSvSPD02(); // default constructor
-    AliITSvSPD02(const char *title); // standard constructor
-    AliITSvSPD02(const AliITSvSPD02 &source); // Copy constructor
-    AliITSvSPD02& operator=(const AliITSvSPD02 &source); // = operator
+    AliITSvSPD02(const char *title,Int_t geomnum=2002); // standard constructor
     virtual ~AliITSvSPD02(); // destructor
-    virtual void   BuildGeometry();
     virtual void   CreateGeometry();
     virtual void   CreateMaterials();
     virtual Int_t  IsVersion() const {// returns the ITS version number 
-                                      return 1;} 
-    virtual void   Init(); 
-    virtual void   SetDefaults();
-    virtual void   DrawModule();
+                                      return (Int_t)kvSPD02;} 
+    virtual void   Init();
+    //virtual void   SetDefaults();
+    virtual void   DrawModule() const;
     virtual void   StepManager(); 
-    virtual void   SetWriteDet(Bool_t det=kTRUE){ // set .det write
-                                                 fGeomDetOut = det;}
-    virtual void   SetWriteDet(const char *f){ // set write file
-                                     strncpy(fWrite,f,60);fGeomDetOut = kTRUE;}
-    virtual void   SetReadDet(Bool_t det=kTRUE){ //set .det read
-                                                fGeomDetIn = det;}
-    virtual void   SetReadDet(const char *f){ // set read file
-                                       strncpy(fRead,f,60);fGeomDetIn = kTRUE;}
-    virtual void   SetEUCLID(Bool_t euclid=kTRUE){ // set write Euclid file
-                                                  fEuclidOut = euclid;}
-    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.){
@@ -52,21 +45,27 @@ class AliITSvSPD02 : public AliITS{
     virtual void   SetThicknessChip2(Float_t v=300.){
          // Set chip thickness in layer 2
          fChip2 = v;}
+    // Replacement default simulation initilization.
+    //virtual void SetDefaultSimulation();
+    //
+  private:
+    void BuildGeometry2002();
+    void CreateGeometry2002();
+    void CreateMaterials2002();
+
  private:  
-    void InitAliITSgeom();
-    Bool_t fGeomDetOut;       // Flag to write .det file out
-    Bool_t fGeomDetIn;        // Flag to read .det file or directly from Geat.
+    AliITSvSPD02(const AliITSvSPD02 &source); // Copy constructor
+    AliITSvSPD02& operator=(const AliITSvSPD02 &source); // = operator
     Int_t  fMajorVersion;     // Major version number == IsVersion
     Int_t  fMinorVersion;     // Minor version number 
-    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 
+    Int_t  fGeomNumber;       // Geometry version number (year)
     Float_t  fDet1;           // thickness of detector in SPD layer 1
     Float_t  fDet2;           // thickness of detector in SPD layer 2
     Float_t  fChip1;          // thickness of chip in SPD layer 1
     Float_t  fChip2;          // thickness of chip in SPD layer 2 
     Int_t fIDMother;          //! ITS Mother Volume id.
+    AliITSInitGeometry fIgm;//! Get access to decoding and AliITSgeom init functins
 
-    ClassDef(AliITSvSPD02,1) // Hits manager and geometry for SPD testbeam
+    ClassDef(AliITSvSPD02,5) // Hits manager and geometry for SPD testbeam
 };
 #endif