Correct initialization of optical properties needed by Geant4 (Andrei)

diff --git a/HMPID/AliHMPID.h b/HMPID/AliHMPID.h
index 2931cfe0d1a4f6295f8aa0552cf2767e3f060e36..9a71c5f2d9d227b776b61940503c829a7b115f99 100644 (file)
--- a/HMPID/AliHMPID.h
+++ b/HMPID/AliHMPID.h
@@ -22,6 +22,7 @@ public:
   virtual void  CreateGeometry  (                )=0;          //from AliModule invoked from AliMC::ConstructGeometry() to build detector for simulation
   virtual Int_t IsVersion       (                )const=0;     //from AliModule not used        
   virtual void  Init            (                )=0;          //from AliModule invoked from AliMC::InitGeometry() after CreateGeometry() to do VolID initialization
+  virtual void  DefineOpticalProperties() {}                   //from AliModule invoked from AliMC::ConstructOpGeometry() to set Cerenkov properties
           void  MakeBranch      (Option_t *opt="");            //from AliModule invokde from AliRun::Tree2Tree() to make requested HMPID branch
           void  SetTreeAddress  (                );            //from AliModule invoked from AliRun::GetEvent(), AliLoader::SetTAddrInDet()
   virtual void  StepManager     (                )=0;          //from AliModule invoked from AliMC

diff --git a/HMPID/AliHMPIDv1.cxx b/HMPID/AliHMPIDv1.cxx
index da3c26c37eed2ff45c03b6b9616a157d8d041112..2e679f2b94bde8829fb302a547d1cf68289b37a7 100644 (file)
--- a/HMPID/AliHMPIDv1.cxx
+++ b/HMPID/AliHMPIDv1.cxx
@@ -263,6 +263,13 @@ void AliHMPIDv1::Init()
   fIdPc      = gMC->VolId("Rpc");
   fIdAmpGap  = gMC->VolId("Rgap");
   fIdProxGap = gMC->VolId("Rgap");
+
+  AliDebug(1,"Stop v1 HMPID.");    
+}
+//++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+void AliHMPIDv1::DefineOpticalProperties()
+{
+// Optical properties definition.
   const Int_t kNbins=30;       //number of photon energy points
   Float_t emin=5.5,emax=8.5;         //Photon energy range,[eV]
   Float_t aEckov [kNbins]; 
@@ -299,8 +306,6 @@ void AliHMPIDv1::Init()
   gMC->SetCerenkov((*fIdtmed)[kCsI]      , kNbins, aEckov, aAbsMet  , aQePc  , aIdxPc  ); //n=1 means convert photons    
   gMC->SetCerenkov((*fIdtmed)[kAl]       , kNbins, aEckov, aAbsMet  , aQeAll , aIdxMet );    
   delete pRaAF;delete pWiAF;delete pGaAF; delete pRaIF; delete pWiIF; delete pGaIF; delete pQeF;
-
-  AliDebug(1,"Stop v1 HMPID.");    
 }
 //++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 Bool_t AliHMPIDv1::IsLostByFresnel()

diff --git a/HMPID/AliHMPIDv1.h b/HMPID/AliHMPIDv1.h
index 92dc5fd6caac0115f50cde532972323c2a569716..e9b2f51a71a064acf55102feb32110a5f9dd9e1a 100644 (file)
--- a/HMPID/AliHMPIDv1.h
+++ b/HMPID/AliHMPIDv1.h
@@ -19,6 +19,7 @@ public:
           void    CreateGeometry   (                                 );                                        //from AliModule invoked from AliMC
   AliDigitizer*   CreateDigitizer  (AliRunDigitizer *m               )const{return new AliHMPIDDigitizer(m);}   //from AliModule invoked from AliSimulation::RunDigitization()
           void    Digits2Raw       (                                 );                                        //from AliModule invoked from AliSimulation::WriteRawFiles()
+  virtual void    DefineOpticalProperties();                                                                   //from AliModule invoked from AliMC::ConstructOpGeometry() to set Cerenkov properties
           void    Hits2SDigits     (                                 );                                        //from AliModule invoked from AliSimulation::RunSDigitization()
           void    Init             (                                 );                                        //from AliModule invoked from AliMC::InitGeometry()
           Int_t   IsVersion        (                                 )const{return 1;                      }   //from AliModule not used

diff --git a/STEER/AliMC.cxx b/STEER/AliMC.cxx
index f8b19afb3b72913ed862570097535f9a0c10002a..d443cd921752cc542c18933ff6426624b2335fad 100644 (file)
--- a/STEER/AliMC.cxx
+++ b/STEER/AliMC.cxx
@@ -178,6 +178,22 @@ void  AliMC::ConstructGeometry()
   
 }
 
+//_______________________________________________________________________
+void  AliMC::ConstructOpGeometry() 
+{
+  //
+  // Loop all detector modules and call DefineOpticalProperties() method 
+  //
+
+  TIter next(gAlice->Modules());
+  AliModule *detector;
+  AliInfo("Optical properties definition");
+  while((detector = dynamic_cast<AliModule*>(next()))) {
+    // Initialise detector optical properties
+    detector->DefineOpticalProperties();
+  }  
+}
+
 //_______________________________________________________________________
 void  AliMC::InitGeometry()
 { 

diff --git a/STEER/AliMC.h b/STEER/AliMC.h
index 3aaf1df32a67f1a91a493261bd1a77e18c442e82..23166f407d073bc1422e0e1c5ecf6dcdce9ed810 100644 (file)
--- a/STEER/AliMC.h
+++ b/STEER/AliMC.h
@@ -38,6 +38,7 @@ public:
 //  MC Application
 //
    virtual  void  ConstructGeometry();
+   virtual  void  ConstructOpGeometry();
    virtual  void  InitGeometry();     
    virtual  void  SetAllAlignableVolumes();     
    virtual  void  GeneratePrimaries();

diff --git a/STEER/AliModule.h b/STEER/AliModule.h
index 5999858a0c57e45428db0480edf39b62f1ea4bdb..b28c2ba31a246e31aa0118e06d3915f3958dff9a 100644 (file)
--- a/STEER/AliModule.h
+++ b/STEER/AliModule.h
@@ -100,6 +100,7 @@ public:
   virtual void        Browse(TBrowser *) {} //PH Do we need it?
   virtual void        CreateGeometry() {}
   virtual void        CreateMaterials() {}
+  virtual void        DefineOpticalProperties() {}
   virtual void        AddAlignableVolumes() const;
   virtual void        Disable();
   virtual void        Enable();

diff --git a/T0/AliT0.h b/T0/AliT0.h
index de26eac0c789a000ecac08cfeca7af669f939164..89fc7f32b13c554f0043d595823c5f0a8a8a643e 100644 (file)
--- a/T0/AliT0.h
+++ b/T0/AliT0.h
@@ -42,6 +42,7 @@ public:
    virtual void   DrawDetector(){}
    virtual Int_t  IsVersion()const {return 0;}
    virtual void   Init();
+   virtual void   DefineOpticalProperties(){}
    virtual void SetHitsAddressBranch(TBranch *b1)
      {b1->SetAddress(&fHits);}
    virtual void   MakeBranch(Option_t *opt=" ");

diff --git a/T0/AliT0v1.cxx b/T0/AliT0v1.cxx
index 7b1025fb6ff94b53f20f90279414539f3b19419c..a899f4bf42360380d9973b24ac25b72e078c227a 100644 (file)
--- a/T0/AliT0v1.cxx
+++ b/T0/AliT0v1.cxx
@@ -567,13 +567,9 @@ void AliT0v1::DrawDetector()
 }
 
 //-------------------------------------------------------------------
-void AliT0v1::Init()
+void AliT0v1::DefineOpticalProperties()
 {
-// Initialises version 0 of the Forward Multiplicity Detector
-//
-//Int_t *idtmed  = gAlice->Idtmed();
-  AliT0::Init();
-  fIdSens1=gMC->VolId("0REG");
+// Optical properties definition.
    Int_t *idtmed = fIdtmed->GetArray();
 // Definition Cherenkov parameters
    int i;
@@ -624,9 +620,17 @@ void AliT0v1::Init()
    gMC->SetCerenkov (idtmed[kOpGlassCathode], kNbins, aPckov, aAbsSiO2,efficAll , rindexSiO2 );
   gMC->SetCerenkov (idtmed[kOpAir], kNbins, aPckov,absorAir , efficAll,rindexAir );
    gMC->SetCerenkov (idtmed[kOpAirNext], kNbins, aPckov,absorbCathodeNext , efficAll, rindexCathodeNext);
+}
 
-   AliDebug(1,Form("%s: *** T0 version 1 initialized ***\n",ClassName()));
+//-------------------------------------------------------------------
+void AliT0v1::Init()
+{
+// Initialises version 0 of the Forward Multiplicity Detector
+//
+  AliT0::Init();
+  fIdSens1=gMC->VolId("0REG");
 
+   AliDebug(1,Form("%s: *** T0 version 1 initialized ***\n",ClassName()));
 }
 
 //-------------------------------------------------------------------

diff --git a/T0/AliT0v1.h b/T0/AliT0v1.h
index dc16289eca50dd8edd7ef79dbed061b77b52d071..aff944ebf140bdef72b6d1a6ffdde115f97a2f16 100644 (file)
--- a/T0/AliT0v1.h
+++ b/T0/AliT0v1.h
@@ -21,6 +21,7 @@ public:
   AliT0v1(const char *name, const char *title);
   virtual       ~AliT0v1();
   virtual void   CreateGeometry();
+  virtual void   DefineOpticalProperties();
   virtual void   AddAlignableVolumes() const;
   virtual void   CreateMaterials();
   virtual void   DrawDetector();

diff --git a/T0/AliT0v2.cxx b/T0/AliT0v2.cxx
index d04abed19759e88ba3ef648859929b31379e4c45..91b1edc948ad4fd967633373c6dd6b82aa89cbe2 100644 (file)
--- a/T0/AliT0v2.cxx
+++ b/T0/AliT0v2.cxx
@@ -245,16 +245,12 @@ void AliT0v2::DrawModule() const
   gMC->Gdopt ("hide", "off");
 }
 
-
 //////////////////////////////////////////////////////////////////////
-// Initialises version 2 of the Forward Multiplicity Detector
+// Definition of optical properties for the Forward Multiplicity Detector
 //////////////////////////////////////////////////////////////////////
-void AliT0v2::Init()
+void AliT0v2::DefineOpticalProperties()
 {
-//Int_t *idtmed  = gAlice->Idtmed();
-
-  AliT0::Init();
-  fIdSens1 = gMC->VolId ("0REG");
+// Optical properties definition.
 // Definition Cherenkov parameters
   const Int_t NUMENTRIES = 32;
 
@@ -303,7 +299,15 @@ void AliT0v2::Init()
 
    gMC->SetCerenkov (idtmed[6], NUMENTRIES, ppckov, absor_qwarz, effic_all, rindex_qwarz);
    gMC->SetCerenkov (idtmed[1], NUMENTRIES, ppckov, absor_air, effic_all, rindex_air);
+}
 
+//////////////////////////////////////////////////////////////////////
+// Initialises version 2 of the Forward Multiplicity Detector
+//////////////////////////////////////////////////////////////////////
+void AliT0v2::Init()
+{
+  AliT0::Init();
+  fIdSens1 = gMC->VolId ("0REG");
   printf ("*** T0 version 2 initialized ***\n");
 }
 

diff --git a/T0/AliT0v2.h b/T0/AliT0v2.h
index 3925ba51dfbb8a8494c74afcd066ab38dccba73a..e8694c2720d7f5c255200e614f50e78a2ddb5cc6 100644 (file)
--- a/T0/AliT0v2.h
+++ b/T0/AliT0v2.h
@@ -19,6 +19,7 @@ public:
   virtual       ~AliT0v2() {}
   virtual void   CreateGeometry();
   virtual void   CreateMaterials();
+  virtual void   DefineOpticalProperties();
   virtual void   DrawModule() const;
   virtual void   Init();
   virtual Int_t  IsVersion() const {return 0;}

diff --git a/TFluka/TFluka.cxx b/TFluka/TFluka.cxx
index 91de886c5310f8746797793b3ae63b47e90d0c48..7418c0ce77f858f8baf5645de7249bb00cec1a43 100644 (file)
--- a/TFluka/TFluka.cxx
+++ b/TFluka/TFluka.cxx
@@ -249,7 +249,7 @@ void TFluka::Init() {
     }
 
     fApplication->InitGeometry();
-
+    fApplication->ConstructOpGeometry();
     //
     // Add ions to PDG Data base
     //