Update for station2:

Added AliMpStationType argument to Create(..);
coding conventions corrections.
(I.Hrivnacova)

diff --git a/MUON/mapping/AliMpPlane.cxx b/MUON/mapping/AliMpPlane.cxx
index 83adcc59493258f7097efa7fc319c925fe081c36..6ec73ba1bfc19c3fe4fc1906741952be4a84907d 100644 (file)
--- a/MUON/mapping/AliMpPlane.cxx
+++ b/MUON/mapping/AliMpPlane.cxx
@@ -21,6 +21,7 @@
 #include "AliMpReader.h"
 #include "AliMpSector.h"
 #include "AliMpSectorPosition.h"
+#include "AliMpIntPair.h"
 
 ClassImp(AliMpPlane)
 
@@ -30,7 +31,7 @@ ClassImp(AliMpPlane)
 
 //______________________________________________________________________________
 AliMpPlane* 
-AliMpPlane::Create(AliMpPlaneType type, 
+AliMpPlane::Create(AliMpStationType station, AliMpPlaneType type, 
                    const TVector2& q1Position, const TVector2& q2Position,
                   const TVector2& q3Position, const TVector2& q4Position)
 {
@@ -38,12 +39,12 @@ AliMpPlane::Create(AliMpPlaneType type,
 // ---
 
   // Build sectors
-  AliMpReader bReader(kBendingPlane);
+  AliMpReader bReader(station, kBendingPlane);
   // bReader.SetVerboseLevel(1);
   AliMpSector* bSector = bReader.BuildSector();
   cout << "bending sector is built" << endl;
 
-  AliMpReader nbReader(kNonBendingPlane);
+  AliMpReader nbReader(station, kNonBendingPlane);
   // nbReader.SetVerboseLevel(1);
   AliMpSector* nbSector = nbReader.BuildSector();
   cout << "non-bending sector is built" << endl;
@@ -57,13 +58,13 @@ AliMpPlane::Create(AliMpPlaneType type,
 }
 
 //______________________________________________________________________________
-AliMpPlane* AliMpPlane::Create(AliMpPlaneType type) 
+AliMpPlane* AliMpPlane::Create(AliMpStationType station, AliMpPlaneType type) 
 {
 // Factory method for creating planes with 
 // not shifted qudrants.
 // ---
 
-  return Create(type, TVector2(), TVector2(), TVector2(), TVector2());
+  return Create(station, type, TVector2(), TVector2(), TVector2(), TVector2());
 }
 
 //

diff --git a/MUON/mapping/AliMpPlane.h b/MUON/mapping/AliMpPlane.h
index e31b75d4401b6d7d6cdc8706d832ffdd1ca0fcda..c3ae76878c651e7a2c056e52201a3a3028ffb859 100644 (file)
--- a/MUON/mapping/AliMpPlane.h
+++ b/MUON/mapping/AliMpPlane.h
@@ -19,14 +19,16 @@
 #define ALI_MP_PLANE_H
 
 #include <TObject.h>
-#include <TVector2.h>
 
 #include "AliMpPlaneTypes.h"
+#include "AliMpStationType.h"
 #include "AliMpPlaneType.h"
-#include "AliMpIntPair.h"
+
+class TVector2;
 
 class AliMpSector;
 class AliMpSectorPosition;
+class AliMpIntPair;
 
 class AliMpPlane : public TObject
 {
@@ -38,10 +40,10 @@ class AliMpPlane : public TObject
     virtual ~AliMpPlane();
     
     // factory methods
-    static AliMpPlane* Create(AliMpPlaneType type,
+    static AliMpPlane* Create(AliMpStationType station, AliMpPlaneType type,
                const TVector2& q1Position, const TVector2& q2Position,
                const TVector2& q3Position, const TVector2& q4Position);
-    static AliMpPlane* Create(AliMpPlaneType type);
+    static AliMpPlane* Create(AliMpStationType station, AliMpPlaneType type);
     
     // methods
     const AliMpSectorPosition* SectorPosition(const AliMpIntPair& scale) const;