z-limits in New Coordinate System.

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

diff --git a/STRUCT/AliDIPOv2.cxx b/STRUCT/AliDIPOv2.cxx
index 3b0c05fade704608ea4af90c9f264e025f76ddbc..12c1fff152b7a849008ae8e6d79b7a6580327418 100644 (file)
--- a/STRUCT/AliDIPOv2.cxx
+++ b/STRUCT/AliDIPOv2.cxx
@@ -13,44 +13,7 @@
  * provided "as is" without express or implied warranty.                  *
  **************************************************************************/
 
-/*
-$Log$
-Revision 1.17  2001/06/21 11:59:25  morsch
-Some more details in compensator geometry.
-
-Revision 1.16  2001/06/20 16:07:08  morsch
-Compensator dipole MBWMD (MCB@SPS) added.
-
-Revision 1.15  2001/03/16 15:34:37  morsch
-Mothervolume defined MANY because overlap with station 3 mothervolume not avoidable (A. de Falco)
-
-Revision 1.14  2000/12/21 16:37:23  morsch
-Use Al for coil and cable material. The materials used before cause the dipole to
-have hydrogene on the outer surface leading to unrealistic gamma rates due to
-n-capture.
-
-Revision 1.13  2000/10/02 21:28:15  fca
-Removal of useless dependecies via forward declarations
-
-Revision 1.12  2000/06/20 10:53:01  morsch
-Volume placed outside mother volume (DDIP) corrected (Galina Chabratova)
-
-Revision 1.11  2000/06/11 12:33:46  morsch
-Coding rule violations corrected
-
-Revision 1.10  2000/06/09 19:32:56  morsch
-New detailed and corrected version from Galina Chabratova
-
-Revision 1.9  2000/04/27 09:29:53  fca
-Reverting to version 1.6.2
-
-Revision 1.6.2.1  1999/12/03 16:38:51  fca
-Correct overlap in magnet
-
-Revision 1.6  1999/09/29 09:24:30  fca
-Introduction of the Copyright and cvs Log
-
-*/
+/* $Id$ */
 
 ///////////////////////////////////////////////////////////////////////////////
 //                                                                           //
@@ -71,11 +34,12 @@ Introduction of the Copyright and cvs Log
 //                                                                           //
 //                                                                           //
 
+#include <TVirtualMC.h>
+
+#include "AliConst.h"
 #include "AliDIPOv2.h"
-#include "AliRun.h"
-#include "AliMC.h"
 #include "AliMagF.h"
-#include "AliConst.h"
+#include "AliRun.h"
  
 ClassImp(AliDIPOv2)
  
@@ -116,8 +80,6 @@ void AliDIPOv2::CreateSpectrometerDipole()
   // Creation of the geometry of the magnetic DIPOLE version 2
   //
 
-  //  AliMC* gMC = AliMC::GetMC();
-
   Float_t cpar[5], tpar[18], ypar[12];
   Float_t dz, dx, dy;
   Int_t idrotm[1899];
@@ -153,11 +115,11 @@ void AliDIPOv2::CreateSpectrometerDipole()
   tpar[11] = 527.34;
 
   tpar[12] = 150.8+kZDipole;
-  tpar[13] = 193.3;
+  tpar[13] = 182.4;
   tpar[14] = 527.34;
   //
-  tpar[15] = 250.55+kZDipole;
-  tpar[16] = 193.3;
+  tpar[15] = 260.55+kZDipole;
+  tpar[16] = 182.4;
   tpar[17] = 527.34;
 
 
@@ -656,8 +618,9 @@ void AliDIPOv2::CreateSpectrometerDipole()
   
   gMC->Gspos("DY2 ", 1, "DDIP",  dx, 0.0,  dz+kZDipole, idrotm[1809], "ONLY");
   gMC->Gspos("DY2 ", 2, "DDIP", -dx, 0.0,  dz+kZDipole, idrotm[1810], "ONLY");
-
-  gMC->Gspos("DDIP", 1, "ALIC", 0., 0., 0., 0, "ONLY");
+  
+  AliMatrix(idrotm[1811], 270., 0., 90., 90., 180., 0.);
+  gMC->Gspos("DDIP", 1, "ALIC", 0., 0., 0., idrotm[1811], "ONLY");
 
   gMC->Gsatt("DDIP", "SEEN", 0);
 //  gMC->Gsatt("DC21", "SEEN", 0);
@@ -675,7 +638,7 @@ void AliDIPOv2::CreateCompensatorDipole()
     Int_t *idtmed = fIdtmed->GetArray()-1799;
     Int_t idrotm[1899];
 //
-    Float_t pbox[3] = {62.5, 62.5, 170.};
+    Float_t pbox[3] = {63., 63., 170.};
     
 //  Mother volumes
     gMC->Gsvolu("DCM0", "BOX", idtmed[1814], pbox, 3);
@@ -795,20 +758,19 @@ void AliDIPOv2::CreateCompensatorDipole()
 
 
     gMC->Gspos("DCBA", 1, "DCM0",  0., -47.5 , 17.5, 0, "ONLY");
-    gMC->Gspos("DCM0", 1, "ALIC",  0., -6.75, -975., 0, "ONLY");
+    AliMatrix(idrotm[1816], 270., 0., 90., 90.,  180., 0.);  
+    gMC->Gspos("DCM0", 1, "ALIC",  0., -6.75,  975., idrotm[1816], "ONLY");
 
 
 }
 
 //_____________________________________________________________________________
-void AliDIPOv2::DrawModule()
+void AliDIPOv2::DrawModule() const
 {
   //
   // Draw a shaded view of the muon absorber
   //
 
-  AliMC* gMC = AliMC::GetMC();
-  
   // Set everything unseen
   gMC->Gsatt("*", "seen", -1);
   //