Adding offset to manuIds when reading non-bending planes.
authorivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 2 Mar 2006 17:01:06 +0000 (17:01 +0000)
committerivana <ivana@f7af4fe6-9843-0410-8265-dc069ae4e863>
Thu, 2 Mar 2006 17:01:06 +0000 (17:01 +0000)
(Laurent)

MUON/mapping/AliMpSectorReader.cxx
MUON/mapping/AliMpSt345Reader.cxx

index 3d72c07..3dbb921 100755 (executable)
@@ -14,7 +14,7 @@
  **************************************************************************/
 
 // $Id$
-// $MpId: AliMpSectorReader.cxx,v 1.5 2005/09/26 16:12:23 ivana Exp $
+// $MpId: AliMpSectorReader.cxx,v 1.7 2006/03/02 16:36:18 ivana Exp $
 // Category: sector
 //
 // Class AliMpSectorReader
 // Included in AliRoot: 2003/05/02
 // Authors: David Guez, Ivana Hrivnacova; IPN Orsay
 
-#if !defined(__HP_aCC) && !defined(__alpha)
-  #include <sstream>
-#endif
-
-#include <Riostream.h>
-#include <Rstrstream.h>
-#include <TSystem.h>
-#include <TError.h>
-#include <TMath.h>
-
 #include "AliMpSectorReader.h"
 #include "AliMpSector.h"
 #include "AliMpFiles.h"
 #include "AliMpConnection.h"
 #include "AliMpIntPair.h"
 #include "AliMpDirection.h"
+#include "AliMpConstants.h"
 
-ClassImp(AliMpSectorReader)
+#include <Riostream.h>
+#include <Rstrstream.h>
+#include <TSystem.h>
+#include <TError.h>
+#include <TMath.h>
+
+#if !defined(__HP_aCC) && !defined(__alpha)
+  #include <sstream>
+#endif
 
 const TString  AliMpSectorReader::fgkSectorKeyword  = "SECTOR_DATA";
 const TString  AliMpSectorReader::fgkZoneKeyword    = "ZONE";
@@ -66,6 +65,8 @@ const TString  AliMpSectorReader::fgkRowSpecialKeyword     = "ROW";
 const TString  AliMpSectorReader::fgkPadRowsKeyword        = "PAD_ROWS";
 const TString  AliMpSectorReader::fgkPadRowSegmentKeyword  = "PAD_ROW_SEGMENT";
 
+ClassImp(AliMpSectorReader)
+
 //_____________________________________________________________________________
 AliMpSectorReader::AliMpSectorReader(AliMpStationType station, 
                                      AliMpPlaneType plane) 
@@ -286,6 +287,9 @@ void AliMpSectorReader::ReadRowSegmentsData(ifstream& in,
     in >> nofMotifs;
     in >> firstMotifPositionId;
     in >> firstMotifPositionDId;
+    
+    firstMotifPositionId |= AliMpConstants::ManuMask(fPlaneType);
+    
     if (fVerboseLevel>0) 
        cout << fgkRowKeyword << " " 
             << offX << " " << offY << " " << inRow << " " << nofMotifs << " " 
@@ -496,6 +500,8 @@ void AliMpSectorReader::ReadRowSegmentSpecialData(ifstream& in,
     in >> motifId;
     in >> motifPositionId; 
   
+    motifPositionId |= AliMpConstants::ManuMask(fPlaneType);
+
     if (fVerboseLevel>0) 
        cout << nofPadsInRow << " " << motifId << " " << motifPositionId << endl;
 
index 50d4ff9..251f618 100644 (file)
@@ -14,7 +14,7 @@
 **************************************************************************/
 
 // $Id$
-// $MpId: AliMpSt345Reader.cxx,v 1.8 2006/01/11 10:45:26 ivana Exp $
+// $MpId: AliMpSt345Reader.cxx,v 1.9 2006/03/02 16:36:23 ivana Exp $
 
 #include "AliMpSt345Reader.h"
 
@@ -28,9 +28,9 @@
 #include "AliMpMotifPosition.h"
 #include "AliMpMotif.h"
 #include "AliMpHelper.h"
+#include "AliMpConstants.h"
 
 #include "Riostream.h"
-
 #include "TClass.h"
 #include "TObjString.h"
 #include "TString.h"
 #include <sstream>
 #include <assert.h>
 
-ClassImp(AliMpSt345Reader)
-
 TMap AliMpSt345Reader::fgPCBMap;
 
+ClassImp(AliMpSt345Reader)
+
 //_____________________________________________________________________________
 AliMpSt345Reader::AliMpSt345Reader() : TObject()
 {
@@ -215,6 +215,11 @@ AliMpSt345Reader::ReadSlat(const char* slatType, AliMpPlaneType planeType)
              delete slat;
              return 0;
       }
+
+      for ( Int_t i = 0; i < manuList.GetSize(); ++i )
+      {
+        manuList[i] |= AliMpConstants::ManuMask(planeType);
+      }
       slat->Add(pcbType,manuList);
     }
   }