Lateral gap for compensator dipole in Tunnel wall.

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

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index 52e8a77a4c0f0364836dd98762519ec07e611747..d6754a3b03a52d477717ffee2c4396545f0242fd 100644 (file)
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -13,33 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.13  2001/06/21 12:26:52  morsch
-Simple concrete shielding around compensator dipole.
-
-Revision 1.12  2001/06/20 16:08:56  morsch
-Remove some shielding to accomodate compensator magnet.
-
-Revision 1.11  2001/05/16 14:57:22  alibrary
-New files for folders and Stack
-
-Revision 1.10  2000/10/02 21:28:15  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.9  2000/06/13 14:55:26  morsch
-Unused variables removed
-
-Revision 1.8  2000/06/11 12:35:41  morsch
-Coding rule violations corrected
-
-Revision 1.7  2000/01/12 15:33:28  morsch
-Muon filter removed
-
-Revision 1.6  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -64,7 +38,6 @@ Introduction of the Copyright and cvs Log
 
 #include "AliHALL.h"
 #include "AliRun.h"
-#include "AliMC.h"
 #include "AliMagF.h"
 #include "AliConst.h"
  
@@ -122,7 +95,7 @@ void AliHALL::CreateGeometry()
 
   
   Float_t r2;
-  Float_t phid, phim, tpar[3], pbox[3], h, r, tspar[5];
+  Float_t phid, phim, pbox[3], h, r, tspar[5];
   Float_t w1, dh, am, bm, dl,cm, hm, dr, dx, xl;
   Int_t idrotm[1999];
   Float_t trdpar[4], trapar[11], hullen;
@@ -169,22 +142,19 @@ void AliHALL::CreateGeometry()
   gMC->Gsvolu("HUWA", "TUBS", idtmed[1956], tspar, 5);
   gMC->Gspos("HUWA", 1, "ALIC", 70., 40.,2020+hullen , 0, "ONLY");
   
-  //     tunnelplug 
-  
-  tpar[0] = 0.;
-  tpar[1] = 50.;
-  tpar[2] = 60.;
-  gMC->Gsvolu("HUP2", "TUBE", idtmed[1954], tpar, 3);
-  
   //     END WALL 
-  
-  pbox[0] = 1200.;
-  pbox[1] = 1300.;
+  gMC->Gsvolu("HEW1", "BOX ", idtmed[1956], pbox, 0);
+  pbox[0] = 600.;
+  pbox[1] = 418.;
   pbox[2] = 60.;
-  gMC->Gsvolu("HEW1", "BOX ", idtmed[1956], pbox, 3);
-  gMC->Gspos("HUP2", 1, "HEW1", 0.,-404., 0.,   0, "ONLY");
-  gMC->Gspos("HEW1", 1, "ALIC", 0., 404., 1960, 0, "ONLY");
-  
+  gMC->Gsposp("HEW1", 1, "ALIC", 0., -pbox[1]-60., 1960, 0, "ONLY", pbox, 3);
+  pbox[1] = 822.;
+  gMC->Gsposp("HEW1", 2, "ALIC", 0.,  pbox[1]+60., 1960, 0, "ONLY", pbox, 3);
+  pbox[0] = 270.;
+  pbox[1] =  60.;
+  gMC->Gsposp("HEW1", 3, "ALIC",  pbox[0]+60.,  0. , 1960, 0, "ONLY", pbox, 3);
+  gMC->Gsposp("HEW1", 4, "ALIC", -pbox[0]-60.,  0. , 1960, 0, "ONLY", pbox, 3);
+
   //     hall floor 
   
   phid      = 16.197;
@@ -279,7 +249,7 @@ void AliHALL::CreateGeometry()
   //     pillars for working platform 
   
   pbox[0] = 40.;
-  pbox[1] = 120.;
+  pbox[1] = 97.;
   pbox[2] = 550.;
   gMC->Gsvolu("HPIL", "BOX ", idtmed[1956], pbox, 3);
   gMC->Gspos("HPIL", 1, "ALIC", 165.,-706+pbox[1] , 1350., 0, "ONLY");
@@ -301,7 +271,27 @@ void AliHALL::CreateGeometry()
 
   gMC->Gsvolu("HMBS", "PGON", idtmed[1956], ppgon, 10);
   gMC->Gspos("HMBS", 1, "ALIC", 0., 70., 0., 0, "ONLY");
-  
+/*
+  ppgon[4] = -1800.;
+  ppgon[5] =     0.;
+  ppgon[6] =   150.;
+  ppgon[7] = -1300.;
+  ppgon[8] =     0.;
+  ppgon[9] =   150.;
+  gMC->Gsvolu("HMBT", "PGON", idtmed[1956], ppgon, 10);
+
+  ppgon[4] = -1800.;
+  ppgon[5] =     0.;
+  ppgon[6] =    10.;
+  ppgon[7] = -1300.;
+  ppgon[8] =     0.;
+  ppgon[9] =    10.;
+  gMC->Gsvolu("HMBU", "PGON", idtmed[1954], ppgon, 10);
+
+  gMC->Gspos("HMBU", 1, "HMBT", 0., -70., 0., 0, "ONLY");
+
+  gMC->Gspos("HMBT", 1, "ALIC", 0.,  70., 0., 0, "ONLY");
+*/  
 }
 
 //_____________________________________________________________________________
@@ -385,7 +375,7 @@ void AliHALL::Init()
 }
 
 //_____________________________________________________________________________
-void AliHALL::DrawModule()
+void AliHALL::DrawModule() const
 {
   //
   // Draw a shaded view of Experimental Hall