Added the sector offset in zones.dat files and

updated AliMpReader and AliMpSector classes to it.

diff --git a/MUON/READMEmapping b/MUON/READMEmapping
index 367fd902d96d2259f592d467bdec09347a9dd705..516f8bc26079ea65b4cb165a528c510b43d840c2 100644 (file)
--- a/MUON/READMEmapping
+++ b/MUON/READMEmapping
@@ -53,6 +53,8 @@
     number of zones  
     number of rows  
     direction of constant pad size (X or Y)
+    offset in X direction
+    offset in Y direction
   
   ZONE     
     number of zone  

diff --git a/MUON/mapping/AliMpReader.cxx b/MUON/mapping/AliMpReader.cxx
index 9c543e343240593e814b727110579b94b43a3006..f1280e5128840000c862ad2d906b9fc81dc45a20 100755 (executable)
--- a/MUON/mapping/AliMpReader.cxx
+++ b/MUON/mapping/AliMpReader.cxx
@@ -183,16 +183,20 @@ void  AliMpReader::ReadSectorData(ifstream& in)
     
   Int_t nofZones, nofRows;
   TString directionStr;
+  Double_t offsetX, offsetY;
   in >> nofZones;
   in >> nofRows;
   in >> directionStr;
+  in >> offsetX;
+  in >> offsetY;
   
   AliMpDirection direction;
   direction = (directionStr == "Y") ? kY  :  kX;
   if (fVerboseLevel>0) 
      cout << nofZones << " " <<  nofRows << endl;
 
-  fSector = new AliMpSector("Not defined", nofZones, nofRows,direction);
+  fSector = new AliMpSector("Not defined", nofZones, nofRows,direction,
+                            TVector2(offsetX, offsetY));
   
   TString nextKeyword;
   in >> nextKeyword;

diff --git a/MUON/mapping/AliMpSector.cxx b/MUON/mapping/AliMpSector.cxx
index d243139bce55757509c2518511eab4923ba04ab8..298c19e2d600c2ac7eabe05dc83cfc25e5749fa5 100755 (executable)
--- a/MUON/mapping/AliMpSector.cxx
+++ b/MUON/mapping/AliMpSector.cxx
@@ -24,10 +24,10 @@ ClassImp(AliMpSector)
 
 //_____________________________________________________________________________
 AliMpSector::AliMpSector(const TString& id, Int_t nofZones, Int_t nofRows, 
-                         AliMpDirection direction) 
+                         AliMpDirection direction, const TVector2& offset) 
   : TObject(),
     fID(id),
-    fOffset(TVector2(0., 0.)),
+    fOffset(offset),
     fZones(),
     fRows(),
     fDirection(direction),
@@ -51,7 +51,6 @@ AliMpSector::AliMpSector(const TString& id, Int_t nofZones, Int_t nofRows,
   for (Int_t irow = 0; irow<nofRows; irow++) 
     fRows.Add(new AliMpRow(irow, fMotifMap));
 #endif
-    
 }
 
 //_____________________________________________________________________________

diff --git a/MUON/mapping/AliMpSector.h b/MUON/mapping/AliMpSector.h
index 04ed6c090436793c4db7cfd597f199fd9f4073fe..485dab96607f51d016eef1349572fc0954581ee0 100755 (executable)
--- a/MUON/mapping/AliMpSector.h
+++ b/MUON/mapping/AliMpSector.h
@@ -28,7 +28,7 @@ class AliMpSector : public TObject
 {
   public:
     AliMpSector(const TString& id, Int_t nofZones, Int_t nofRows,
-                AliMpDirection direction);
+                AliMpDirection direction, const TVector2& offset);
     AliMpSector();
     virtual ~AliMpSector();
   
@@ -52,6 +52,7 @@ class AliMpSector : public TObject
     // geometry 
     TVector2  Position() const;
     TVector2  Dimensions() const;
+    TVector2  Offset() const;
    
     // get methods
     Int_t       GetNofZones() const;
@@ -88,6 +89,9 @@ class AliMpSector : public TObject
 
 // inline functions
 
+inline TVector2  AliMpSector::Offset() const
+{ return fOffset; }
+
 inline AliMpDirection AliMpSector::GetDirection() const 
 { return fDirection; }    
 

diff --git a/MUON/mapping/data/station1/bending_plane/zones.dat b/MUON/mapping/data/station1/bending_plane/zones.dat
index 451f7bcf3f3e32a8b0109695504e1679c4520f5c..bec808b07cb884e4f91d6bd193cff0d9ef7ee1dd 100755 (executable)
--- a/MUON/mapping/data/station1/bending_plane/zones.dat
+++ b/MUON/mapping/data/station1/bending_plane/zones.dat
@@ -1,5 +1,5 @@
 SECTOR_DATA
-       4  13 Y
+       4  13 Y  0.0  0.0
 
 ZONE 1  6.3   4.2
        SUBZONE 1    A  

diff --git a/MUON/mapping/data/station1/non-bending_plane/zones.dat b/MUON/mapping/data/station1/non-bending_plane/zones.dat
index 5f1009e56b4ca5d4d40987e9d035a0999a246ad2..b8b3c6a2e356e58fd7b2cd9ef9128ab16aa4b310 100755 (executable)
--- a/MUON/mapping/data/station1/non-bending_plane/zones.dat
+++ b/MUON/mapping/data/station1/non-bending_plane/zones.dat
@@ -1,5 +1,5 @@
 SECTOR_DATA
-       4  13 X
+       4  13 X  -0.315  0.21
 
 ZONE 1  6.3   4.2
        SUBZONE 4        A  

diff --git a/MUON/mapping/data/station2/bending_plane/zones.dat b/MUON/mapping/data/station2/bending_plane/zones.dat
index 7a63fdb5f800c93d2f06182af489aed5ed17fa5a..3e0df7e92ce9f6352416fc3284de17585e8c11b9 100755 (executable)
--- a/MUON/mapping/data/station2/bending_plane/zones.dat
+++ b/MUON/mapping/data/station2/bending_plane/zones.dat
@@ -1,5 +1,5 @@
 SECTOR_DATA
-       3 13 Y
+       3 13 Y  0.0  0.0
   
 ZONE 1  7.5   5.0
        SUBZONE 7        A  

diff --git a/MUON/mapping/data/station2/non-bending_plane/zones.dat b/MUON/mapping/data/station2/non-bending_plane/zones.dat
index 91b48daaecf12ea13a2762f96cb7279beff1dcbb..920c149f2fe40e9e6cf7fb67c60fa2517d136b6c 100755 (executable)
--- a/MUON/mapping/data/station2/non-bending_plane/zones.dat
+++ b/MUON/mapping/data/station2/non-bending_plane/zones.dat
@@ -1,5 +1,5 @@
 SECTOR_DATA
-       3 12 X
+       3 12 X  0.0  0.0
 
 ZONE 1  7.5   5.0
        SUBZONE 7        A