Transition to NewIO

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

diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx
index ccae59db52149f503cc9e27b164eb73532a68723..431dc62b8ad7dc6b7b9d14b7aec9bbf22933b047 100644 (file)
--- a/STRUCT/AliHALL.cxx
+++ b/STRUCT/AliHALL.cxx
@@ -13,18 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-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$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -47,9 +36,12 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <TVirtualMC.h>
+
+#include "AliConst.h"
 #include "AliHALL.h"
+#include "AliMagF.h"
 #include "AliRun.h"
-#include "AliConst.h"
  
 ClassImp(AliHALL)
  
@@ -105,7 +97,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;
@@ -152,22 +144,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;
@@ -262,28 +251,28 @@ void AliHALL::CreateGeometry()
   //     pillars for working platform 
   
   pbox[0] = 40.;
-  pbox[1] = 120.;
+  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");
   
-  //     concrete beam shield 
-  
-  pbox[0] = 402.5;
-  pbox[1] = 260.;
-  pbox[2] = 120.;
-  gMC->Gsvolu("HMBS", "BOX ", idtmed[1956], pbox, 3);
-  pbox[0] = 85.;
-  pbox[1] = 100.;
-  gMC->Gsvolu("HBBS", "BOX ", idtmed[1956], pbox, 3);
-  gMC->Gspos("HBBS", 1, "HMBS", -157.5, 0., 0., 0, "ONLY");
-  pbox[0] = 40.;
-  pbox[1] = 130.;
-  gMC->Gsvolu("HPBS", "BOX ", idtmed[1956], pbox, 3);
-  gMC->Gspos("HPBS", 1, "HMBS", 202.5,  30.,    0., 0, "ONLY");
-  gMC->Gspos("HMBS", 1, "ALIC", 157.5, -50., -820., 0, "ONLY");
-  
+  //     simple concrete beam shield 
+  
+  Float_t ppgon[10];
+  ppgon[0] =    45.;
+  ppgon[1] =   360.;
+  ppgon[2] =     4.;
+  ppgon[3] =     2.;
+  ppgon[4] = -1800.;
+  ppgon[5] =   150.;
+  ppgon[6] =   250.;
+  ppgon[7] =  -720.;
+  ppgon[8] =   150.;
+  ppgon[9] =   250.;
+
+  gMC->Gsvolu("HMBS", "PGON", idtmed[1956], ppgon, 10);
+  gMC->Gspos("HMBS", 1, "ALIC", 0., 70., 0., 0, "ONLY");
 }
 
 //_____________________________________________________________________________
@@ -353,19 +342,21 @@ void AliHALL::Init()
   //
   Int_t i;
   //
-  printf("\n");
-  for(i=0;i<35;i++) printf("*");
-  printf(" HALL_INIT ");
-  for(i=0;i<35;i++) printf("*");
-  printf("\n");
-  //
-  // Here the HALL 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(" HALL_INIT ");
+    for(i=0;i<35;i++) printf("*");
+    printf("\n%s: ",ClassName());
+    //
+    // Here the HALL initialisation code (if any!)
+    for(i=0;i<80;i++) printf("*");
+    printf("\n");
+  }
 }
 
 //_____________________________________________________________________________
-void AliHALL::DrawModule()
+void AliHALL::DrawModule() const
 {
   //
   // Draw a shaded view of Experimental Hall