Variable number of modules introduced

diff --git a/ChangeLog b/ChangeLog
index 9d511864addb717f5dd9252297df2146dcc2590a..d6f62a9dc2cbcbc0520897eff15242ce6a76a2c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,36 @@
    cvs2cl.pl.  See http://www.red-bean.com/~kfogel/cvs2cl.shtml for more.
   -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+- -+-
 
+1999-06-25 06:24  fca
+
+       * ChangeLog, CASTOR/AliCASTOR.cxx, FMD/AliFMDv0.cxx,
+       FMD/AliFMDv1.cxx, ITS/AliITS.cxx, ITS/AliITSv0.cxx,
+       ITS/AliITSv1.cxx, ITS/AliITSv3.cxx, ITS/AliITSv4.cxx,
+       MUON/AliMUONv0.cxx, PHOS/AliPHOS.cxx, PHOS/AliPHOS.h,
+       PHOS/AliPHOSv0.cxx, PHOS/AliPHOSv2.cxx, PMD/AliPMDv0.cxx,
+       PMD/AliPMDv1.cxx, PMD/AliPMDv2.cxx, RICH/AliRICH.cxx,
+       STEER/AliDisplay.h, STEER/AliModule.cxx, STEER/AliModule.h,
+       STEER/AliPDG.h, STEER/AliRun.cxx, STEER/AliRun.h,
+       STRUCT/AliABSO.cxx, STRUCT/AliBODY.cxx, STRUCT/AliDIPOv1.cxx,
+       STRUCT/AliDIPOv2.cxx, STRUCT/AliFRAMEv1.cxx, STRUCT/AliHALL.cxx,
+       STRUCT/AliMAG.cxx, STRUCT/AliPIPEv1.cxx, STRUCT/AliPIPEv3.cxx,
+       STRUCT/AliSHIL.cxx, TOF/AliTOF.cxx, TOF/AliTOFv0.cxx,
+       TOF/AliTOFv1.cxx, TOF/AliTOFv2.cxx, TOF/AliTOFv3.cxx,
+       TPC/AliTPC.cxx, TPC/AliTPCv0.cxx, TPC/AliTPCv1.cxx,
+       TPC/AliTPCv2.cxx, TRD/AliTRD.cxx, TRD/AliTRDv0.cxx,
+       TRD/AliTRDv1.cxx, TRD/AliTRDv2.cxx, ZDC/AliZDC.cxx,
+       conf/MachineDef.Linux, data/galice.cuts: Medium array is now
+       private for each module
+
+1999-06-24 22:08  fca
+
+       * TPC/AliTPCv2.cxx: need stdlib.h for exit
+
+1999-06-24 19:21  fca
+
+       * STEER/GParticle.cxx, STEER/GParticle.h: GParticle not used any
+       more
+
 1999-06-24 14:29  fca
 
        * EVGEN/AliGenFLUKAsource.cxx, EVGEN/AliGenHalo.cxx,
@@ -109,9 +139,9 @@
        TGeant3/TPaveTree.cxx, TOF/AliTOF.cxx, TOF/AliTOFv0.cxx,
        TOF/AliTOFv1.cxx, TOF/AliTOFv2.cxx, TOF/AliTOFv3.cxx,
        TPC/AliTPC.cxx, TPC/AliTPCD.cxx, TPC/AliTPCv0.cxx,
-       TPC/AliTPCv1.cxx, TPC/AliTPCv2.cxx, TRD/AliTRD.cxx,
-       TRD/AliTRDv0.cxx, TRD/AliTRDv1.cxx, TRD/AliTRDv2.cxx,
-       ZDC/AliZDC.cxx, html/AliRootHelp.html, html/AliceHelp.html,
+       TPC/AliTPCv1.cxx, TRD/AliTRD.cxx, TRD/AliTRDv0.cxx,
+       TRD/AliTRDv1.cxx, TRD/AliTRDv2.cxx, ZDC/AliZDC.cxx,
+       html/AliRootHelp.html, html/AliceHelp.html,
        html/EXAMPLE_Index_head.html, html/EXAMPLE_Index_tail.html,
        html/GeantALICE.html, html/HandsOn.html, html/Installation.html,
        html/Manual.html, html/Overview.html, html/Packages.html,
@@ -124,6 +154,10 @@
        the documentation. In particular pictures are all now in picts
        subdirectory
 
+       * TPC/AliTPCv2.cxx: branches:  1.6.2; Some rationalisation of the
+       documentation. In particular pictures are all now in picts
+       subdirectory
+
        * ITS/AliITS.cxx, STEER/AliLego.cxx: branches:  1.2.2; Some
        rationalisation of the documentation. In particular pictures are
        all now in picts subdirectory

diff --git a/ITS/AliITSv5.cxx b/ITS/AliITSv5.cxx
index 0fba03388b9c9b5a49917be1ef56ecf3cfc5a92f..c8219e3a5f7646153ac4b93876c69823f5791789 100644 (file)
--- a/ITS/AliITSv5.cxx
+++ b/ITS/AliITSv5.cxx
@@ -58,7 +58,7 @@ void AliITSv5::CreateMaterials()
   FILE *file = fopen(fEuclidMaterial.Data(),"r");
   if(file) {
     fclose(file);
-    gAlice->ReadEuclidMedia(fEuclidMaterial.Data(),2);
+    gAlice->ReadEuclidMedia(fEuclidMaterial.Data(),this);
   } else {
     Error("CreateMaterials"," THE MEDIA FILE %s DOES NOT EXIST !",fEuclidMaterial.Data());
     exit(1);
@@ -82,7 +82,7 @@ void AliITSv5::CreateGeometry()
   delete [] filtmp;
   if(file) {
     fclose(file);
-    gAlice->ReadEuclid(fEuclidGeometry.Data(),2,topvol);
+    gAlice->ReadEuclid(fEuclidGeometry.Data(),this,topvol);
   } else {
     Error("CreateGeometry"," THE GEOM FILE %s DOES NOT EXIST !",fEuclidGeometry.Data());
     exit(1);

diff --git a/STEER/AliModule.cxx b/STEER/AliModule.cxx
index 4419ebda6755601e713cfabd154acd3bca48713d..7c5f26d87d3cebc6c68353977fd6822989fc8649 100644 (file)
--- a/STEER/AliModule.cxx
+++ b/STEER/AliModule.cxx
@@ -52,14 +52,14 @@ AliModule::AliModule(const char* name,const char *title):TNamed(name,title)
   //  
   // Get the Module numeric ID
   Int_t id = gAlice->GetModuleID(name);
-  if (id < 0) {
-    // Unknown Module !
-     Warning("AliRun::Ctor","ERROR Unknown Module: %s\n",name);
+  if (id>=0) {
+    // Module already added !
+     Warning("Ctor","Module: %s already present at %d\n",name,id);
      return;
   }
   //
   // Add this Module to the list of Modules
-  gAlice->Modules()->AddAtAndExpand(this,id);
+  gAlice->Modules()->Add(this);
   //
   //
   SetMarkerColor(3);

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index 658c20126745e8861085b36564990086c79142fc..bf2cea2e00764cb3c5186e65ddc5c15c64141547 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -35,15 +35,15 @@ public:
   // Inline functions
   virtual  int           GetNdigits() {return 0;}
   virtual  int           GetNhits()   {return 0;}
-  virtual  TArrayI      *GetIdtmed()   {return fIdtmed;}
-  virtual  TList        *Histograms() {return fHistograms;}
-  virtual  TList        *Nodes()  {return fNodes;}
+  virtual  TArrayI      *GetIdtmed()   const {return fIdtmed;}
+  virtual  TList        *Histograms() const {return fHistograms;}
+  virtual  TList        *Nodes()  const {return fNodes;}
   virtual  TClonesArray *Digits() {return 0;}
   virtual  TClonesArray *Hits()   {return 0;}
   virtual  TObjArray    *Points() {return 0;}
   virtual  Int_t         GetIshunt() {return 0;}
   virtual  void          SetIshunt(Int_t) {}
-  virtual  Bool_t        IsActive() {return fActive;}
+  virtual  Bool_t        IsActive() const {return fActive;}
   virtual  Bool_t        IsFolder() {return kTRUE;}
   virtual  Int_t&        LoMedium() {return fLoMedium;}
   virtual  Int_t&        HiMedium() {return fHiMedium;}

diff --git a/STEER/AliRun.h b/STEER/AliRun.h
index f4c40a6a2c2b897b1666efe7234876841ecdc83c..9765bea6d4649beafab13bca8b960d1df2b284b6 100644 (file)
--- a/STEER/AliRun.h
+++ b/STEER/AliRun.h
@@ -36,14 +36,14 @@ protected:
   TTree        *fTreeH;        //Pointer to Tree for Hits
   TTree        *fTreeE;        //Pointer to Tree for Header
   TTree        *fTreeR;        //Pointer to Tree for Reconstructed Objects
-  TObjArray    *fModules;    //List of Detectors
+  TObjArray    *fModules;      //List of Detectors
   TClonesArray *fParticles;    //Pointer to list of particles
   TGeometry    *fGeometry;     //Pointer to geometry
   AliDisplay   *fDisplay;      //Pointer to event display
   TStopwatch    fTimer;        //Timer object
   AliMagF      *fField;        //Magnetic Field Map
   AliMC        *fMC;           //pointer to MonteCarlo object
-  char          fDnames[kMaxModules][kLenModuleName];
+  //  char          fDnames[kMaxModules][kLenModuleName];
                                //Array of detector names
   TArrayI      *fImedia;       //Array of correspondence between media and detectors
   Int_t         fNdets;        //Number of detectors
@@ -132,8 +132,8 @@ public:
   // Functions from GEOCAD
   //_______________________________________________________________________
   
-   virtual void ReadEuclid(const char*, Int_t, const char*);
-   virtual void ReadEuclidMedia(const char*, Int_t);
+   virtual void ReadEuclid(const char*, const AliModule*, const char*);
+   virtual void ReadEuclidMedia(const char*, const AliModule*);
 
    TTree         *TreeD() {return fTreeD;}
    TTree         *TreeE() {return fTreeE;}

diff --git a/STRUCT/AliFRAMEv0.cxx b/STRUCT/AliFRAMEv0.cxx
index af3652fdff9709d09f42e4b21694f86c1608941f..b6266abe74e55940735f5049b53ab0c75bf10204 100644 (file)
--- a/STRUCT/AliFRAMEv0.cxx
+++ b/STRUCT/AliFRAMEv0.cxx
@@ -58,9 +58,9 @@ void AliFRAMEv0::CreateGeometry()
   if(file) {
     fclose(file);
     printf(" Reading FRAME \n");
-    gAlice->ReadEuclid(framename,12,topvol);
+    gAlice->ReadEuclid(framename,this,topvol);
   } else {
-    printf(" THE GEOM FILE %s DOES NOT EXIST !\n",framename);
+    Warning("CreateGeometry","The Euclid file %s does not exist!\n",framename);
     exit(1);
   }
 //
@@ -86,9 +86,9 @@ void AliFRAMEv0::CreateMaterials()
   delete [] filetmp;
   if(file) {
     fclose(file);
-    gAlice->ReadEuclidMedia(name,12);
+    gAlice->ReadEuclidMedia(name,this);
   } else {
-    printf(" THE MEDIA FILE %s DOES NOT EXIST !\n",name);
+    Warning("CreateMaterials","The material file %s does not exist!\n",name);
     exit(1);
   }
 }

diff --git a/STRUCT/AliPIPEv0.cxx b/STRUCT/AliPIPEv0.cxx
index 8bfa026c104feb5b451d67b340074d9d89cac36a..eb8f12d7a18c8429a5030a77979a452d2262c2df 100644 (file)
--- a/STRUCT/AliPIPEv0.cxx
+++ b/STRUCT/AliPIPEv0.cxx
@@ -55,7 +55,7 @@ void AliPIPEv0::CreateGeometry()
   if(file) {
     fclose(file);
     printf(" Reading PIPE \n");
-    gAlice->ReadEuclid(pipename,20,topvol);
+    gAlice->ReadEuclid(pipename,this,topvol);
   } else {
     printf(" THE GEOM FILE %s DOES NOT EXIST !\n",pipename);
     exit(1);
@@ -68,7 +68,7 @@ void AliPIPEv0::CreateGeometry()
   if(file) {
     fclose(file);
     printf(" Reading PUMP \n");
-    gAlice->ReadEuclid(pumpname,20,topvol);
+    gAlice->ReadEuclid(pumpname,this,topvol);
   } else {
     printf(" THE GEOM FILE %s DOES NOT EXIST !\n",pumpname);
     exit(1);
@@ -107,7 +107,7 @@ void AliPIPEv0::CreateMaterials()
   delete [] filtmp;
   if(file) {
     fclose(file);
-    gAlice->ReadEuclidMedia(name,20);
+    gAlice->ReadEuclidMedia(name,this);
   } else {
     printf(" THE MEDIA FILE %s DOES NOT EXIST !\n",name);
     exit(1);