DrawModule declared const

[u/mrichter/AliRoot.git] / VZERO / AliVZEROv5.cxx

diff --git a/VZERO/AliVZEROv5.cxx b/VZERO/AliVZEROv5.cxx
index 384d6a8cfd7ef4d01513713aff4957e466d88a3f..347adaddb9c430076bba6bef038a2afb7d503874 100755 (executable)
--- a/VZERO/AliVZEROv5.cxx
+++ b/VZERO/AliVZEROv5.cxx
@@ -35,7 +35,6 @@
 
 // --- ROOT libraries ---
 #include <TClonesArray.h>
-#include <TGeant3.h>
 #include <TGeometry.h>
 #include <TLorentzVector.h>
 #include <TMath.h>
@@ -756,7 +755,6 @@ void AliVZEROv5::CreateMaterials()
 
     Int_t *idtmed = fIdtmed->GetArray()-2999;
     
-//    TGeant3 *geant3 = (TGeant3*) gMC;
     
 //  Parameters related to Quarz (SiO2) :
  
@@ -786,10 +784,17 @@ void AliVZEROv5::CreateMaterials()
     Float_t wscin[2] = {1.,1.};
     Float_t denscin  = 1.032;
     
+// AIR
+
+    Float_t aAir[4]={12.,14.,16.,36.};
+    Float_t zAir[4]={6.,7.,8.,18.};
+    Float_t wAir[4]={0.000124,0.755267,0.231781,0.012827};
+    Float_t dAir = 1.20479E-3;
+        
 //  Definition of materials :
        
-    AliMaterial( 1, "AIR A$", 14.61, 7.3, .001205, 30420., 67500, 0, 0);
-    AliMaterial(11, "AIR I$", 14.61, 7.3, .001205, 30420., 67500, 0, 0);
+    AliMixture( 1, "AIR A$", aAir,zAir,dAir,4,wAir);
+    AliMixture(11, "AIR I$", aAir,zAir,dAir,4,wAir);
     AliMaterial( 2, "CARBON$"  , 12.01, 6.0, 2.265, 18.8, 49.9, 0, 0);
     AliMixture(  3, "QUA", aqua, zqua, densqua, nlmatqua, wmatqua);
     AliMaterial( 4, "ALUMINIUM1$", 26.98, 13., 2.7, 8.9, 37.2, 0, 0);
@@ -879,7 +884,7 @@ void AliVZEROv5::CreateMaterials()
 }
 
 //_____________________________________________________________________________
-void AliVZEROv5::DrawModule()
+void AliVZEROv5::DrawModule() const
 {
 
 //  Drawing is done in DrawVZERO.C
@@ -933,19 +938,30 @@ void AliVZEROv5::StepManager()
      vol[2]    = gMC->CurrentVolID(copy);
      vol[3]    = copy;
      
-     if      ( gMC->CurrentVolID(copy) == gMC->VolId("V0R1") ||
-               gMC->CurrentVolID(copy) == gMC->VolId("V0L1") )
+     static Int_t idV0R1 = gMC->VolId("V0R1");
+     static Int_t idV0L1 = gMC->VolId("V0L1");
+     static Int_t idV0R2 = gMC->VolId("V0R2");
+     static Int_t idV0L2 = gMC->VolId("V0L2");
+     static Int_t idV0R3 = gMC->VolId("V0R3");
+     static Int_t idV0L3 = gMC->VolId("V0L3");
+     static Int_t idV0R4 = gMC->VolId("V0R4");
+     static Int_t idV0L4 = gMC->VolId("V0L4");
+     static Int_t idV0R5 = gMC->VolId("V0R5");
+     static Int_t idV0R6 = gMC->VolId("V0R6");
+
+     if      ( gMC->CurrentVolID(copy) == idV0R1 ||
+               gMC->CurrentVolID(copy) == idV0L1 )
               ringNumber = 1.0;
-     else if ( gMC->CurrentVolID(copy) == gMC->VolId("V0R2") ||
-               gMC->CurrentVolID(copy) == gMC->VolId("V0L2") ) 
+     else if ( gMC->CurrentVolID(copy) == idV0R2 ||
+               gMC->CurrentVolID(copy) == idV0L2 ) 
               ringNumber = 2.0;  
-     else if ( gMC->CurrentVolID(copy) == gMC->VolId("V0R3") ||
-               gMC->CurrentVolID(copy) == gMC->VolId("V0R4") ||
-               gMC->CurrentVolID(copy) == gMC->VolId("V0L3") )
+     else if ( gMC->CurrentVolID(copy) == idV0R3 ||
+               gMC->CurrentVolID(copy) == idV0R4 ||
+               gMC->CurrentVolID(copy) == idV0L3 )
               ringNumber = 3.0;
-     else if ( gMC->CurrentVolID(copy) == gMC->VolId("V0R5") ||
-               gMC->CurrentVolID(copy) == gMC->VolId("V0R6") ||
-               gMC->CurrentVolID(copy) == gMC->VolId("V0L4") )
+     else if ( gMC->CurrentVolID(copy) == idV0R5 ||
+               gMC->CurrentVolID(copy) == idV0R6 ||
+               gMC->CurrentVolID(copy) == idV0L4 )
               ringNumber = 4.0;               
      else
               ringNumber = 0.0;