X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliHALL.cxx;h=d577d6ac1543bcc8807e2035c17865bf19dbf8f7;hb=1050d19e76f2409485e1f6b3b927c1190c8b8b69;hp=d6754a3b03a52d477717ffee2c4396545f0242fd;hpb=9c671c0f2a224b811c48e1d29e0157acfc665051;p=u%2Fmrichter%2FAliRoot.git

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index d6754a3b03a..d577d6ac154 100644
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -36,10 +36,12 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TVirtualMC.h>
+
+#include "AliConst.h"
 #include "AliHALL.h"
-#include "AliRun.h"
 #include "AliMagF.h"
-#include "AliConst.h"
+#include "AliRun.h"
  
 ClassImp(AliHALL)
  
@@ -109,17 +111,17 @@ void AliHALL::CreateGeometry()
   h   = 140.;
   phi = TMath::ACos(h / r);
   xl  = r * TMath::Sin(phi);
-  dr  = 100.;
+  dr  = 1600.;
   dh  = dr * TMath::Cos(phi);
   dl  = dr * TMath::Sin(phi);
   if (gAlice->GetModule("ZDC") == 0) {
     
     //     No ZDC 
-    hullen = 250.;
+    hullen = 370.;
   } else {
     
     //     ZDC is present 
-    hullen = 6400.;
+    hullen = 6520.;
   }
   trdpar[0] = xl + dl;
   trdpar[1] = xl;
@@ -128,8 +130,8 @@ void AliHALL::CreateGeometry()
   AliMatrix(idrotm[1900], 90., 0., 0., 0., 90., 90.);
   AliMatrix(idrotm[1901], 270., 0., 90., 90., 0., 0.);
   gMC->Gsvolu("HUFL", "TRD1", idtmed[1956], trdpar, 4);
-  r2 = hullen + 2020.;
-  gMC->Gspos("HUFL", 1, "ALIC", 70.,-100-trdpar[3] , r2, idrotm[1900], "ONLY");
+  r2 = hullen + 1900.;
+  gMC->Gspos("HUFL", 1, "ALIC", 70.,-100-trdpar[3] , -r2, idrotm[1900], "ONLY");
   
   //     RB24/26 wall 
   
@@ -140,20 +142,20 @@ void AliHALL::CreateGeometry()
   tspar[3] = phid - 90.;
   tspar[4] = 270. - phid;
   gMC->Gsvolu("HUWA", "TUBS", idtmed[1956], tspar, 5);
-  gMC->Gspos("HUWA", 1, "ALIC", 70., 40.,2020+hullen , 0, "ONLY");
+  gMC->Gspos("HUWA", 1, "ALIC", 70., 40., -1900 - hullen , 0, "ONLY");
   
   //     END WALL 
-  gMC->Gsvolu("HEW1", "BOX ", idtmed[1956], pbox, 0);
-  pbox[0] = 600.;
-  pbox[1] = 418.;
-  pbox[2] = 60.;
-  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);
+  //gMC->Gsvolu("HEW1", "BOX ", idtmed[1956], pbox, 0);
+  //pbox[0] = 600.;
+  //pbox[1] = 418.;
+  //pbox[2] = 60.;
+  //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 
   
@@ -249,11 +251,11 @@ void AliHALL::CreateGeometry()
   //     pillars for working platform 
   
   pbox[0] = 40.;
-  pbox[1] = 97.;
+  pbox[1] = 96.;
   pbox[2] = 550.;
   gMC->Gsvolu("HPIL", "BOX ", idtmed[1956], pbox, 3);
-  gMC->Gspos("HPIL", 1, "ALIC", 165.,-706+pbox[1] , 1350., 0, "ONLY");
-  gMC->Gspos("HPIL", 2, "ALIC",-165.,-706+pbox[1] , 1350., 0, "ONLY");
+  gMC->Gspos("HPIL", 1, "ALIC", 165.,-706+pbox[1] , -1350., 0, "ONLY");
+  gMC->Gspos("HPIL", 2, "ALIC",-165.,-706+pbox[1] , -1350., 0, "ONLY");
   
   //     simple concrete beam shield 
   
@@ -262,36 +264,15 @@ void AliHALL::CreateGeometry()
   ppgon[1] =   360.;
   ppgon[2] =     4.;
   ppgon[3] =     2.;
-  ppgon[4] = -1800.;
-  ppgon[5] =   150.;
-  ppgon[6] =   250.;
-  ppgon[7] =  -720.;
+  ppgon[7] =  1800.;
   ppgon[8] =   150.;
   ppgon[9] =   250.;
+  ppgon[4] =   720.;
+  ppgon[5] =   150.;
+  ppgon[6] =   250.;
 
   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");
-*/  
 }
 
 //_____________________________________________________________________________