X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=STRUCT%2FAliHALL.cxx;h=cd6a76cd9cda1fbe76ad2044f01626339aac3f42;hb=fa3aac32ff229654eb01a4adf05c6a1858825bb2;hp=2a80c6ec071c1d93135e4ad18fd472dacfb9746b;hpb=43ea1292b64759b841288db71760842ec14a52bc;p=u%2Fmrichter%2FAliRoot.git diff --git a/STRUCT/AliHALL.cxx b/STRUCT/AliHALL.cxx index 2a80c6ec071..cd6a76cd9cd 100644 --- a/STRUCT/AliHALL.cxx +++ b/STRUCT/AliHALL.cxx @@ -13,48 +13,7 @@ * provided "as is" without express or implied warranty. * **************************************************************************/ -/* -$Log$ -Revision 1.17 2002/10/14 14:57:39 hristov -Merging the VirtualMC branch to the main development branch (HEAD) - -Revision 1.14.6.2 2002/06/14 10:29:54 hristov -Merged with v3-08-03 - -Revision 1.16 2002/06/12 08:28:28 morsch -HBMT positioning commented out. - -Revision 1.15 2002/05/28 08:47:38 morsch -Reduces size of pillars to avoid overlap with DIPO. - -Revision 1.14 2001/11/16 12:38:26 morsch -Reverse z-ordering in HMBS. (I. Hrivnacova) - -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$ */ /////////////////////////////////////////////////////////////////////////////// // // @@ -77,10 +36,12 @@ Introduction of the Copyright and cvs Log // // /////////////////////////////////////////////////////////////////////////////// +#include + +#include "AliConst.h" #include "AliHALL.h" -#include "AliRun.h" #include "AliMagF.h" -#include "AliConst.h" +#include "AliRun.h" ClassImp(AliHALL) @@ -136,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; @@ -170,7 +131,7 @@ void AliHALL::CreateGeometry() 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"); + gMC->Gspos("HUFL", 1, "ALIC", 70.,-100-trdpar[3] , -r2, idrotm[1900], "ONLY"); // RB24/26 wall @@ -181,24 +142,21 @@ 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"); - - // tunnelplug - - tpar[0] = 0.; - tpar[1] = 50.; - tpar[2] = 60.; - gMC->Gsvolu("HUP2", "TUBE", idtmed[1954], tpar, 3); + gMC->Gspos("HUWA", 1, "ALIC", 70., 40., -2020 - hullen , 0, "ONLY"); // 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; @@ -293,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 @@ -306,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"); -*/ } //_____________________________________________________________________________ @@ -419,7 +356,7 @@ void AliHALL::Init() } //_____________________________________________________________________________ -void AliHALL::DrawModule() +void AliHALL::DrawModule() const { // // Draw a shaded view of Experimental Hall