Overlaps between dipole and hall corrected.

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

diff --git a/STRUCT/AliHALLv3.cxx b/STRUCT/AliHALLv3.cxx
index d1c55b9bc49693f9589f7924542f70001d5e3c29..1de9ac8bddc2cfe336efaaf0770c89bfffb6c5ba 100644 (file)
--- a/STRUCT/AliHALLv3.cxx
+++ b/STRUCT/AliHALLv3.cxx
@@ -83,8 +83,8 @@ void AliHALLv3::CreateGeometry()
   
   // Rotations
   // rotation by 90 deg in the y-z plane
-  TGeoRotation* rot000 = new TGeoRotation("rot000",  90., 0.,  0.,  0., 90., 90.);  
-  TGeoRotation* rot001 = new TGeoRotation("rot001", 270., 0., 90., 90.,  0.,  0.);  
+  TGeoRotation* rot000 = new TGeoRotation("rot000",  90., 0.,180.,  0.,    90., 90.);  
+  TGeoRotation* rot001 = new TGeoRotation("rot001", 270., 0., 90., 90.,   180.,  0.);  
 
   // Materials
   TGeoMedium* kMedCC     = gGeoManager->GetMedium("HALL_CC_C2");
@@ -140,7 +140,7 @@ void AliHALLv3::CreateGeometry()
                                      new TGeoTrd1(xl +dl, xl, hullen, dh / 2.),
                                      kMedCC);
   r2 = hullen + zHall26;
-  asHall->AddNode(voHUFL, 1, new TGeoCombiTrans(70., -100. - dh / 2., -r2, rot000));
+  asHall->AddNode(voHUFL, 1, new TGeoCombiTrans(70., -100. - dh / 2., -r2 - 0.75, rot000));
 
   //
   // RB24/26 wall 
@@ -167,7 +167,7 @@ void AliHALLv3::CreateGeometry()
   
   TGeoCompositeShape*  shHUWAT = new TGeoCompositeShape("HUWAT", "(shHUWAT1-shHUWAT2:tHUWAT2)-shHUWAT3:tHUWAT3");
   TGeoVolume* voHUWAT = new TGeoVolume("HUWAT", shHUWAT, kMedAir);
-  asHall->AddNode(voHUWAT, 1, new TGeoTranslation(70., 40., -zHall26 - hullen));
+  asHall->AddNode(voHUWAT, 1, new TGeoTranslation(70., 40., -zHall26 - hullen - 0.75));
   
   //
   //  Hall floor 
@@ -274,7 +274,7 @@ void AliHALLv3::CreateGeometry()
                                      new TGeoTrd1(dx1FloorL3, dx2FloorL3, dzL3/2., dyFloorL3/2.), 
                                      kMedCC);
 
-  asHall->AddNode(voHHF2, 1, new TGeoCombiTrans(0., yFloor - dyFloor / 2. + dyFloorL3 / 2.,0., rot000));
+  asHall->AddNode(voHHF2, 1, new TGeoCombiTrans(0., yFloor - dyFloor / 2. + dyFloorL3 / 2. - 0.5,0., rot000));
   //
   // Tunnel roof and pit
   // Roof
@@ -333,7 +333,7 @@ void AliHALLv3::CreateGeometry()
   //
   // Transverse bars
   ys += dy;
-  dy = 126.46/2.;
+  dy = 91.32/2.;
   ys += dy;
   TGeoVolume* voFmsMfTb1 = new TGeoVolume("FmsMfTb1", new TGeoBBox(330., dy,  90.), kMedCC);
   asFMS->AddNode(voFmsMfTb1, 1, new TGeoTranslation(0., ys, zFil));
@@ -345,7 +345,7 @@ void AliHALLv3::CreateGeometry()
   //
   // Dipole foundation
   ys = yFloor + dyFloor / 2.;
-  dy = 263.54/2;
+  dy = (263.54 - 6.2)/2.;
   ys += dy;
   TGeoVolume* voFmsDf1 = new TGeoVolume("FmsDf1", new TGeoBBox(370., dy,  448.0 / 2.), kMedCC);
   asFMS->AddNode(voFmsDf1, 1, new TGeoTranslation(0., ys, zFil + 240. + 224.));