Correct value for ROOT_HAS*

[u/mrichter/AliRoot.git] / STRUCT / AliHALLv3.cxx

diff --git a/STRUCT/AliHALLv3.cxx b/STRUCT/AliHALLv3.cxx
index 48260d99323742203543d2273b05022fa4edacac..cf348da3cd1dbb3b0ac90f5315d02ef95ffae1fb 100644 (file)
--- a/STRUCT/AliHALLv3.cxx
+++ b/STRUCT/AliHALLv3.cxx
@@ -49,7 +49,7 @@
 ClassImp(AliHALL)
  
 //_____________________________________________________________________________
-AliHALLv3::AliHALLv3() : fNewShield24(0), fRefVolumeId(-1), fScoring(0)
+AliHALLv3::AliHALLv3() : fNewShield24(0), fRefVolumeId(-1), fScoring(0), fRackShield(0)
 {
   //
   // Default constructor for the experimental Hall
@@ -58,7 +58,7 @@ AliHALLv3::AliHALLv3() : fNewShield24(0), fRefVolumeId(-1), fScoring(0)
  
 //_____________________________________________________________________________
 AliHALLv3::AliHALLv3(const char *name, const char *title)
-  : AliHALL(name,title), fNewShield24(0), fRefVolumeId(-1), fScoring(0)
+  : AliHALL(name,title), fNewShield24(0), fRefVolumeId(-1), fScoring(0), fRackShield(0)
 {
   //
   // Standard constructor for the experimental Hall
@@ -92,6 +92,7 @@ void AliHALLv3::CreateGeometry()
   TGeoMedium* kMedCC     = gGeoManager->GetMedium("HALL_CC_C2");
   TGeoMedium* kMedST     = gGeoManager->GetMedium("HALL_STST_C2");
   TGeoMedium* kMedAir    = gGeoManager->GetMedium("HALL_AIR_C2");
+  TGeoMedium* kMedFe     = gGeoManager->GetMedium("HALL_FE_C2");
   
   // Floor thickness 
   Float_t dyFloor  =  190.;
@@ -485,7 +486,13 @@ void AliHALLv3::CreateGeometry()
   TGeoVolume* voRB24Scoring = new TGeoVolume("RB24Scoring", new TGeoTube(4.3, 300., 1.), kMedAir);
   asHall->AddNode(voRB24Scoring, 1, new TGeoTranslation(0., 0., 735.));
   //
-
+  // Extra shielding in front of racks
+  //
+  if (fRackShield) {
+    TGeoVolume* voRackShield = new TGeoVolume("RackShield", new TGeoBBox(30., 125., 50.), kMedFe);
+    asHall->AddNode(voRackShield, 1, new TGeoTranslation(85., -495., 1726.));
+  }
+  //
   top->AddNode(asHall, 1, gGeoIdentity);
   
 }
@@ -506,7 +513,7 @@ void AliHALLv3::Init()
     }
 //
 // The reference volume id
-    fRefVolumeId = gMC->VolId("RB24Scoring");
+    fRefVolumeId = TVirtualMC::GetMC()->VolId("RB24Scoring");
 }
 
 void AliHALLv3::StepManager()
@@ -520,15 +527,15 @@ void AliHALLv3::StepManager()
   
   //
   // Only charged tracks
-  if( !(gMC->TrackCharge()) ) return; 
+  if( !(TVirtualMC::GetMC()->TrackCharge()) ) return; 
   //
   // Only tracks entering mother volume
   // 
 
-  id=gMC->CurrentVolID(copy);
+  id=TVirtualMC::GetMC()->CurrentVolID(copy);
 
   if ((id != fRefVolumeId))   return;
-  if(!gMC->IsTrackEntering()) return;
+  if(!TVirtualMC::GetMC()->IsTrackEntering()) return;
   //
   // Add the reference track
   //