From be05e10c89b4bddb8ad3f488cf1e1286b69307cd Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Wed, 8 Oct 2003 08:16:11 +0000
Subject: [PATCH 1/1] Corrections for SAA3 and compensator magnet.

---
 STRUCT/AliSHILv0.cxx | 21 ++++++++-------------
 STRUCT/AliSHILv2.cxx |  2 +-
 STRUCT/AliSHILvF.cxx | 19 +++++++------------
 STRUCT/SHILConst.h   |  2 +-
 STRUCT/SHILConst2.h  |  2 +-
 5 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index 4d07c5975a5..1b9a9f3aed1 100644
--- a/STRUCT/AliSHILv0.cxx
+++ b/STRUCT/AliSHILv0.cxx
@@ -902,24 +902,19 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712,
 //
 // Magnet element 
 //
-  tpar[0]=0.;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]= 0.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YAEM", "TUBE", idtmed[kAir], tpar, 3);
-  tpar[0]=kRAbs;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]=17.6/2.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YFEM", "TUBE", idtmed[kFe], tpar, 3);
   gMC->Gspos("YFEM", 1, "YAEM", 0., 0., 0., 0, "ONLY"); 
 
 //
-
-  if (gMC->VolId("HUP2")) {
-      gMC->Gspos("YAEM", 1, "HUP2", 0., 0., 0., 0, "ONLY");
-  } else {
-      dz=kZvac12+60.;
-      gMC->Gspos("YAEM", 1, "ALIC", 0., 0., dz, 0, "ONLY"); 
-  }
+  dz=1921.6 + tpar[2];
+  gMC->Gspos("YAEM", 1, "ALIC", 0., 0.,  dz, 0, "ONLY"); 
 
 // 
 //
diff --git a/STRUCT/AliSHILv2.cxx b/STRUCT/AliSHILv2.cxx
index d2764d358a2..953933195b4 100644
--- a/STRUCT/AliSHILv2.cxx
+++ b/STRUCT/AliSHILv2.cxx
@@ -1445,7 +1445,7 @@ void AliSHILv2::CreateGeometry()
   tpar[1]= 40.;
   tpar[2]=85.;
   gMC->Gsvolu("YAEM", "TUBE", idtmed[kAir], tpar, 3);
-  tpar[0]=6.3/2.;
+  tpar[0]=17.6/2.;
   tpar[1]=40.;
   tpar[2]=85.;
   gMC->Gsvolu("YFEM", "TUBE", idtmed[kFe], tpar, 3);
diff --git a/STRUCT/AliSHILvF.cxx b/STRUCT/AliSHILvF.cxx
index 7bdac292d36..b69c8d3f134 100644
--- a/STRUCT/AliSHILvF.cxx
+++ b/STRUCT/AliSHILvF.cxx
@@ -1372,23 +1372,18 @@ enum {kC=1705, kAl=1708, kFe=1709, kCu=1710, kW=1711, kPb=1712,
 // Magnet element 
 //
   tpar[0]=0.;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YAEM", "TUBE", idtmed[kAir], tpar, 3);
-  tpar[0]=kRAbs;
-  tpar[1]=kR43;
-  tpar[2]=60.;
+  tpar[0]=17.6/2.;
+  tpar[1]=40.;
+  tpar[2]=85.;
   gMC->Gsvolu("YFEM", "TUBE", idtmed[kFe], tpar, 3);
   gMC->Gspos("YFEM", 1, "YAEM", 0., 0., 0., 0, "ONLY"); 
 
 //
-
-  if (gAlice->GetModule("HALL")) {
-      gMC->Gspos("YAEM", 1, "HUP2", 0., 0., 0., 0, "ONLY");
-  } else {
-      dz=kZvac12+60.;
-      gMC->Gspos("YAEM", 1, "ALIC", 0., 0., dz, 0, "ONLY"); 
-  }
+  dz=1921.6 + tpar[2];
+  gMC->Gspos("YAEM", 1, "ALIC", 0., 0.,  dz, 0, "ONLY"); 
   
 // 
 //
diff --git a/STRUCT/SHILConst.h b/STRUCT/SHILConst.h
index 9be7ed0acc1..b9646b4977b 100644
--- a/STRUCT/SHILConst.h
+++ b/STRUCT/SHILConst.h
@@ -96,7 +96,7 @@
 
   const Float_t kR41=35.;
   const Float_t kR42=49.9;
-  const Float_t kR43=60.;
+  const Float_t kR43=110.;
 
 //
 // Vacuum System
diff --git a/STRUCT/SHILConst2.h b/STRUCT/SHILConst2.h
index c4538a0de43..94eb02a831b 100644
--- a/STRUCT/SHILConst2.h
+++ b/STRUCT/SHILConst2.h
@@ -92,7 +92,7 @@
 
   const Float_t kR41=35.;
   const Float_t kR42=49.9;
-  const Float_t kR43=40.;
+  const Float_t kR43=110.;
 
 //
 // Vacuum System
-- 
2.39.3