Updated for replacement of AliMpReader with AliMpSectorReader

(Ivana)

diff --git a/MUON/AliMUONSt12QuadrantSegmentation.cxx b/MUON/AliMUONSt12QuadrantSegmentation.cxx
index 5e857751e5f723f5330acb3fe26b679556499665..201fb3ec578620c74481d2ea1d157bce1b2c3b0b 100644 (file)
--- a/MUON/AliMUONSt12QuadrantSegmentation.cxx
+++ b/MUON/AliMUONSt12QuadrantSegmentation.cxx
@@ -29,7 +29,7 @@
 
 #include "AliMpPad.h"
 #include "AliMpArea.h"
-#include "AliMpReader.h"
+#include "AliMpSectorReader.h"
 #include "AliMpSector.h"
 #include "AliMpVPadIterator.h"
 #include "AliMpSectorSegmentation.h"
@@ -186,7 +186,7 @@ void AliMUONSt12QuadrantSegmentation::ReadMappingData()
      //cout << "AliMpFiles top path set to " << dirPath << endl;         
    }
   
-  AliMpReader r(fStationType, fPlaneType);
+  AliMpSectorReader r(fStationType, fPlaneType);
   fSector = r.BuildSector();
   fSectorSegmentation = new AliMpSectorSegmentation(fSector);
 }

diff --git a/MUON/AliMUONSt1GeometryBuilderV2.cxx b/MUON/AliMUONSt1GeometryBuilderV2.cxx
index 8aca558741d76d1ba40b723c8a0bc78bc7453a7d..e07e4d2a658f3309108acb3f1717aea3a84aee1b 100644 (file)
--- a/MUON/AliMUONSt1GeometryBuilderV2.cxx
+++ b/MUON/AliMUONSt1GeometryBuilderV2.cxx
@@ -40,7 +40,7 @@
 #include <TVirtualMC.h>
 
 #include "AliMpFiles.h"
-#include "AliMpReader.h"
+#include "AliMpSectorReader.h"
 #include "AliMpSector.h"
 #include "AliMpRow.h"
 #include "AliMpVRowSegment.h"
@@ -514,7 +514,7 @@ void AliMUONSt1GeometryBuilderV2::CreateQuadrant(Int_t chamber)
   specialMap.Add(47, (Long_t) new AliMUONSt1SpecialMotif(TVector2(1.01, 0.36)));
 #endif
 
-  AliMpReader reader1(kStation1, kBendingPlane);
+  AliMpSectorReader reader1(kStation1, kBendingPlane);
   AliMpSector* sector1 = reader1.BuildSector();
 
   //Bool_t reflectZ = true;
@@ -550,12 +550,12 @@ void AliMUONSt1GeometryBuilderV2::CreateQuadrant(Int_t chamber)
       // Was: specialMap.Add(47,(Long_t) new AliMUONSt1SpecialMotif(TVector2(1.61,-1.18)));
 #endif
 
-  AliMpReader reader2(kStation1, kNonBendingPlane);
+  AliMpSectorReader reader2(kStation1, kNonBendingPlane);
   AliMpSector* sector2 = reader2.BuildSector();
   
   //reflectZ = false;
   reflectZ = true;
-  TVector2 offset = sector2->Offset();
+  TVector2 offset = sector2->Position();
   where = TVector3(where.X()+offset.X()/10., where.Y()+offset.Y()/10., 0.); 
       // Add the half-pad shift of the non-bending plane wrt bending plane
       // (The shift is defined in the mapping as sector offset)