Fixing bugs in FMD reconstruction. Everything should work now

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

diff --git a/STRUCT/AliMAG.cxx b/STRUCT/AliMAG.cxx
index 95a841f1b9834e900f91a63db1b2bdf2a16b14ec..a8fd702d8e87fee7e322b58231e16b33c0c39f99 100644 (file)
--- a/STRUCT/AliMAG.cxx
+++ b/STRUCT/AliMAG.cxx
@@ -35,14 +35,15 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
  
-#include <TVirtualMC.h>
-#include <TGeoMedium.h>
-#include <TGeoVolume.h>
+#include <TGeoCompositeShape.h>
+#include <TGeoGlobalMagField.h>
+#include <TGeoManager.h>
 #include <TGeoMatrix.h>
+#include <TGeoMedium.h>
 #include <TGeoPgon.h>
+#include <TGeoVolume.h>
 #include <TGeoXtru.h>
-#include <TGeoCompositeShape.h>
-#include <TGeoManager.h>
+#include <TVirtualMC.h>
 
 #include "AliMAG.h"
 #include "AliMagF.h"
@@ -71,9 +72,9 @@ AliMAG::AliMAG(const char *name, const char *title)
   */
   //End_Html
   
-  SetMarkerColor(7);
-  SetMarkerStyle(2);
-  SetMarkerSize(0.4);
+  //PH  SetMarkerColor(7);
+  //PH  SetMarkerStyle(2);
+  //PH  SetMarkerSize(0.4);
 }
 
 //_____________________________________________________________________________
@@ -99,7 +100,7 @@ void AliMAG::CreateGeometry()
     const Float_t kStartAngle          =   22.5; // deg
     const Float_t kFullAngle           =  360.0; // deg
 //  Mother volume 
-    const Float_t kRBMotherInner       = 560.00; // cm
+    const Float_t kRBMotherInner       = 600.00; // cm
     const Float_t kRBMotherOuter       = 790.50; // cm
     const Float_t kLBMother            = 706.00; // cm
 // Yoke     
@@ -117,13 +118,13 @@ void AliMAG::CreateGeometry()
     const Float_t kRThermalShieldInner = 566.00; // cm
     const Float_t kRThermalShieldOuter = 571.00; // cm
 // Crown    
-    const Float_t kRCrownInner         = 560.00; // cm    
+    const Float_t kRCrownInner         = 600.00; // cm    
     const Float_t kRCrownOuter         = 785.50; // cm
     const Float_t kLCrown1             = 605.00; // cm
     const Float_t kLCrown2             = 620.00; // cm
     const Float_t kLCrown3             = 706.00; // cm
 // Door
-    const Float_t kRDoorOuter          = 560.00; // cm
+    const Float_t kRDoorOuter          = 600.00; // cm
     const Float_t kRPlugInner          = 183.50; // cm
     const Float_t kLDoor1              = 615.50; // cm
     const Float_t kLDoor2              = 714.60; // cm
@@ -151,7 +152,7 @@ void AliMAG::CreateGeometry()
   shBMother->DefineSection(0, -kLBMother, kRBMotherInner, kRBMotherOuter);
   shBMother->DefineSection(1,  kLBMother, kRBMotherInner, kRBMotherOuter);  
   // 
-  TGeoVolume* voBMother = new TGeoVolume("L3BM", shBMother, medAir);
+  TGeoVolumeAssembly* voBMother = new TGeoVolumeAssembly("L3BM");
   //
   // Define Thermal Shield
   //
@@ -345,8 +346,8 @@ void AliMAG::CreateMaterials()
   // Create materials for L3 magnet
   //
   
-  Int_t   isxfld = gAlice->Field()->Integ();
-  Float_t sxmgmx = gAlice->Field()->Max();
+  Int_t   isxfld = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Integ();
+  Float_t sxmgmx = ((AliMagF*)TGeoGlobalMagField::Instance()->GetField())->Max();
   Float_t epsil, stmin, deemax, tmaxfd, stemax;