Overlap in closing cone corrected (thanks to Ivana Hrivnacova)

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

diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index 88750cdd41c5ad6ee0c96b75779811deba108cd4..16bc1e9eecf81a05dbd5e3a80c2112dd5a1af132 100644 (file)
--- a/STRUCT/AliSHILv0.cxx
+++ b/STRUCT/AliSHILv0.cxx
@@ -15,6 +15,9 @@
 
 /*
 $Log$
+Revision 1.12  2001/03/16 16:26:05  morsch
+Put vacuum in beam-pipe not air.
+
 Revision 1.11  2000/10/27 15:21:24  morsch
 Shield composition after muon project leader meeting: 24/10/2000
 - 1 cm recess in steel for station 3
@@ -999,7 +1002,7 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712,
   cpar0[1]=r3-dVacuS+(zvac11-zvac9)*TMath::Tan(thetaOpen3);
   cpar0[2]=r3       +(zvac11-zvac9)*TMath::Tan(thetaOpen3);
   cpar0[3]=rVacu;
-  cpar0[4]=rAbs;
+  cpar0[4]=rVacu+dTubeS+dInsuS+dProtS+dFreeS;
   gMC->Gsvolu("YV32", "CONE", idtmed[kSteel+40], cpar0, 5);
 //
 // insulation
@@ -1179,13 +1182,15 @@ void AliSHILv0::Init()
   //
   Int_t i;
   //
-  printf("\n");
-  for(i=0;i<35;i++) printf("*");
-  printf(" SHILv0_INIT ");
-  for(i=0;i<35;i++) printf("*");
-  printf("\n");
-  //
-  // Here the SHIL initialisation code (if any!)
-  for(i=0;i<80;i++) printf("*");
-  printf("\n");
+  if(fDebug) {
+    printf("\n%s: ",ClassName());
+    for(i=0;i<35;i++) printf("*");
+    printf(" SHILv0_INIT ");
+    for(i=0;i<35;i++) printf("*");
+    printf("\n%s: ",ClassName());
+    //
+    // Here the SHIL initialisation code (if any!)
+    for(i=0;i<80;i++) printf("*");
+    printf("\n");
+  }
 }