X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliSHILv0.cxx;h=011eafbd31f8e38d08b6b8a227de6b00e39ddae5;hb=4cfeb4f10eed49c039c9a458c933cdfefdb53548;hp=57e9a11f917fe1c1d25015b32dbd29a8e8423b3d;hpb=43ea1292b64759b841288db71760842ec14a52bc;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index 57e9a11f917..011eafbd31f 100644
--- a/STRUCT/AliSHILv0.cxx
+++ b/STRUCT/AliSHILv0.cxx
@@ -13,81 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.21  2002/10/29 17:20:38  hristov
-Corrections for subscript out of range (Alpha)
-
-Revision 1.20  2002/10/29 09:53:40  morsch
-Constants start with k. Warnings corrected.
-
-
-Revision 1.19  2002/10/14 14:57:39  hristov
-Merging the VirtualMC branch to the main development branch (HEAD)
-
-Revision 1.17.6.1  2002/07/24 13:33:35  alibrary
-Make geometry consistent with new current parameters.
-
-Revision 1.18  2002/07/24 13:28:49  morsch
-Make geometry consistent with new current parameters.
-
-Revision 1.17  2001/11/17 01:29:21  morsch
-Obsolete and wrong volume YXO5 removed.
-
-Revision 1.16  2001/11/16 08:57:42  morsch
-Volume YP32 obsolete.
-
-Revision 1.15  2001/11/05 10:41:06  morsch
-Avoid overlap of compensation magnet with HALL.
-
-Revision 1.14  2001/10/26 08:36:19  morsch
-Geometry update.
-
-Revision 1.13  2001/04/23 23:12:41  morsch
-Overlap in closing cone corrected (thanks to Ivana Hrivnacova)
-
-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
-- no heavy shielding between chambers for stations 1 and 2
-
-Revision 1.10  2000/10/02 21:28:15  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.9  2000/09/12 17:00:45  morsch
-Overlaps in YMO3 and YMO4 (side-effect from last update only) corrected.
-
-Revision 1.8  2000/09/12 16:11:43  morsch
-- Bug in volume YGO2 corrected: PCON started with twice the same z-value.
-- Recesses for chambers added to outer Pb cone.
-
-Revision 1.7  2000/06/15 09:40:31  morsch
-Obsolete typedef keyword removed
-
-Revision 1.6  2000/06/13 15:01:38  morsch
-Make kind of heavy shielding material (Pb, NiCuW) dependent on presence of outer cone.
-
-Revision 1.5  2000/06/12 19:40:00  morsch
-New structure of beam pipe and heating jacket.
-Optional outer Pb cone added. Not yet compatible with chamber inner radii.
-
-Revision 1.4  2000/04/03 08:13:40  fca
-Introduce extra scope for non ANSI compliant C++ compilers
-
-Revision 1.3  2000/01/17 10:29:30  morsch
-Overlap between Shield and Absorber due to limited numerical precision removed
-by displacing the Shield by epsilon = 0.01 cm.
-
-Revision 1.2  2000/01/13 11:27:51  morsch
-Overlaps corrected: YCS3, YCS4; Inner radius YS21 corrected
-
-Revision 1.1  2000/01/12 15:44:03  morsch
-Standard version of SHIL
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -103,9 +29,12 @@ Standard version of SHIL
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
-#include "AliSHILv0.h"
-#include "AliRun.h"
+#include <TVirtualMC.h>
+
 #include "AliConst.h"
+#include "AliRun.h"
+#include "AliSHILv0.h"
+#include "AliLog.h"
 
 ClassImp(AliSHILv0)
  
@@ -974,24 +903,19 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712,
 //
 // Magnet element 
 //
-  tpar[0]=0.;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]= 0.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YAEM", "TUBE", idtmed[kAir], tpar, 3);
-  tpar[0]=kRAbs;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]=17.6/2.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YFEM", "TUBE", idtmed[kFe], tpar, 3);
   gMC->Gspos("YFEM", 1, "YAEM", 0., 0., 0., 0, "ONLY"); 
 
 //
-
-  if (gMC->VolId("HUP2")) {
-      gMC->Gspos("YAEM", 1, "HUP2", 0., 0., 0., 0, "ONLY");
-  } else {
-      dz=kZvac12+60.;
-      gMC->Gspos("YAEM", 1, "ALIC", 0., 0., dz, 0, "ONLY"); 
-  }
+  dz=1921.6 + tpar[2];
+  gMC->Gspos("YAEM", 1, "ALIC", 0., 0.,  dz, 0, "ONLY"); 
 
 // 
 //
@@ -1274,7 +1198,7 @@ void AliSHILv0::Init()
   Int_t i;
   //
   
-  if(fDebug) {
+  if(AliLog::GetGlobalDebugLevel()>0) {
       printf("\n%s: ",ClassName());
       for(i=0;i<35;i++) printf("*");
       printf(" SHILv0_INIT ");