Removed fMajor/MinorVersion variables in favor of variables in derived classes.

Set arrays char *det[3] = {"SPD","SDD","SSD"} as const.

diff --git a/ITS/AliITS.cxx b/ITS/AliITS.cxx
index f0958bbfc698499057cc8af5f3f77025a6239833..435dc363e3c528422a9e8c448adb0a19ac94b205 100644 (file)
--- a/ITS/AliITS.cxx
+++ b/ITS/AliITS.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.31  2001/02/02 23:57:28  nilsen
+Added include file that are no londer included in AliITSgeom.h
+
 Revision 1.30  2001/01/30 09:23:13  hristov
 Streamers removed (R.Brun)
 
@@ -577,18 +580,11 @@ void AliITS::Init(){
   //
   Int_t i;
 
-  cout << endl;
-  for(i=0;i<30;i++) cout << "*";cout << " ITS_INIT ";
-  for(i=0;i<30;i++) cout << "*";cout << endl;
 //
   SetDefaults();
-// TObjArray of TObjStrings
-//  for(i=0;i<fIdN;i++) fIdSens[i] = gMC->VolId((fIdName->At(i))->GetName());
 // Array of TStrings
   for(i=0;i<fIdN;i++) fIdSens[i] = gMC->VolId(fIdName[i]);
 //
-  for(i=0;i<70;i++) cout << "*";
-  cout << endl;
 }
 
 //_____________________________________________________________________________
@@ -683,7 +679,7 @@ void AliITS::MakeTreeC(Option_t *option)
      Int_t buffersize = 4000;
      char branchname[30];
 
-     char *det[3] = {"SPD","SDD","SSD"};
+     const char *det[3] = {"SPD","SDD","SSD"};
 
      // one branch for Clusters per type of detector
      Int_t i;
@@ -709,7 +705,7 @@ void AliITS::GetTreeC(Int_t event)
     char treeName[20];
     char branchname[30];
 
-    char *det[3] = {"SPD","SDD","SSD"};
+    const char *det[3] = {"SPD","SDD","SSD"};
 
     ResetClusters();
     if (fTreeC) {
@@ -757,7 +753,7 @@ void AliITS::MakeBranch(Option_t* option, char *file)
   //
   // one branch for digits per type of detector
   //
-   char *det[3] = {"SPD","SDD","SSD"};
+   const char *det[3] = {"SPD","SDD","SSD"};
 
    char digclass[40];
    char clclass[40];
@@ -811,7 +807,7 @@ void AliITS::SetTreeAddress()
   char branchname[30];
   AliDetector::SetTreeAddress();
 
-  char *det[3] = {"SPD","SDD","SSD"};
+  const char *det[3] = {"SPD","SDD","SSD"};
 
   TBranch *branch;
   TTree *treeD = gAlice->TreeD();

diff --git a/ITS/AliITS.h b/ITS/AliITS.h
index a6706585bdab5aeb167fc44b7ef33a7914163381..62d2a59d1c4dad3f39b516ea0decb4ac1aa4bf10 100644 (file)
--- a/ITS/AliITS.h
+++ b/ITS/AliITS.h
@@ -60,8 +60,10 @@ class AliITS : public AliDetector {
     virtual void   ResetRecPoints();
 
     // get geometry version - detailed (major) or coarse (minor)
-    void GetGeometryVersion(Int_t &a,Int_t &b) const 
-                  {a = fMajorVersion;b=fMinorVersion;return;}
+    virtual Int_t  GetMajorVersion(){return -1;}
+    virtual Int_t  GetMinorVersion(){return -1;}
+    void GetGeometryVersion(Int_t &a,Int_t &b) 
+                  {a = GetMajorVersion();b=GetMinorVersion();return;}
     virtual Int_t  IsVersion() const {return 1;}
     virtual Int_t  DistancetoPrimitive(Int_t px, Int_t py);
     virtual void   Init();
@@ -154,10 +156,7 @@ class AliITS : public AliDetector {
     Int_t       fIdN;          // the number of layers
     Int_t      *fIdSens;       //[fIdN] layer identifier
 //    TObjArray  *fIdName;       // array of volume Id names
-    TString  *fIdName;       //[fIdN] layer identifier
-    // Geometry and Stepmanager version numbers used.
-    Int_t fMajorVersion;      // detailed and coarse(minor) versions
-    Int_t fMinorVersion;      // detailed and coarse(minor) versions
+    TString    *fIdName;       //[fIdN] layer identifier
     //
     Int_t          fNDetTypes;   // Number of detector types
     TObjArray     *fDetTypes;    // List of detector types