Corrections for SAA3 and compensator magnet.

diff --git a/STRUCT/AliSHILv0.cxx b/STRUCT/AliSHILv0.cxx
index 4d07c5975a57b717625798f0232e575c0c2c4b88..1b9a9f3aed1255bdbcb78892fd5e8c7808a205bf 100644 (file)
--- 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 
 //
 //
 // 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);
   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"); 
 
 //
   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 d2764d358a23bb16697eb8ee72ce20e37b0cc223..953933195b46268f418a47a027dddf721c1bb28a 100644 (file)
--- 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[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);
   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 7bdac292d36c9053da881c210538516f225dabbc..b69c8d3f13436fa7a6c0743cb50a15613f4e5f12 100644 (file)
--- 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.;
 // 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);
   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"); 
 
 //
   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 9be7ed0acc13b777562235eadbeb1479e7133508..b9646b4977ba785d4fa559c5627b956ea1edeae4 100644 (file)
--- 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 kR41=35.;
   const Float_t kR42=49.9;

-  const Float_t kR43=60.;
+  const Float_t kR43=110.;

 
 //
 // Vacuum System
 
 //
 // Vacuum System

diff --git a/STRUCT/SHILConst2.h b/STRUCT/SHILConst2.h
index c4538a0de43fc54bed7297e1007e75b0589ce74c..94eb02a831bae3bb90400775248a0084d4d4eacb 100644 (file)
--- 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 kR41=35.;
   const Float_t kR42=49.9;

-  const Float_t kR43=40.;
+  const Float_t kR43=110.;

 
 //
 // Vacuum System
 
 //
 // Vacuum System