Option for customized binning (as in AliUEHist), EventMixing binning now derived...

[u/mrichter/AliRoot.git] / MUON / mapping / AliMpDEStore.h

diff --git a/MUON/mapping/AliMpDEStore.h b/MUON/mapping/AliMpDEStore.h
index 493a79e6db310d7700d4482ea654cffeb9abb3c4..cd41a1dc7b710511ff7aa1583d34a0ee13b10719 100644 (file)
--- a/MUON/mapping/AliMpDEStore.h
+++ b/MUON/mapping/AliMpDEStore.h
@@ -20,9 +20,10 @@
 #include "AliMpExMap.h"
 #include "AliMpPlaneType.h"
 #include "AliMpStationType.h"
-#include "AliMpIntPair.h"
+#include "AliMpStation12Type.h"
 
 class AliMpDetElement;
+class AliMpDataStreams;
 class TString;
 
 class AliMpDEStore : public  TObject {
@@ -30,19 +31,21 @@ class AliMpDEStore : public  TObject {
   friend class AliMpDEIterator;
 
   public:
-    AliMpDEStore(TRootIOCtor* /*ioCtor*/);
+    AliMpDEStore(TRootIOCtor* ioCtor);
     virtual ~AliMpDEStore();
     
     // static access method
-    static AliMpDEStore* Instance(); 
+    static AliMpDEStore* Instance(Bool_t warn = true); 
+    static AliMpDEStore* ReadData(const AliMpDataStreams& dataStreams,
+                                  Bool_t warn = true);
     
     // methods
     AliMpDetElement* GetDetElement(Int_t detElemId, Bool_t warn = true) const;
     AliMpDetElement* GetDetElement(const TString& detName, Bool_t warn = true) const;
-
-    AliMpIntPair     GetDetElemIdManu(Int_t manuSerial) const;
     
   private:
+    AliMpDEStore(const AliMpDataStreams& dataStreams);
+    /// Not implemented
     AliMpDEStore();
     /// Not implemented
     AliMpDEStore(const AliMpDEStore& rhs);
@@ -51,12 +54,9 @@ class AliMpDEStore : public  TObject {
 
     // methods
     Bool_t IsPlaneType(const TString& planeTypeName);
-    AliMp::PlaneType   PlaneType(const TString& planeTypeName);
-    AliMp::StationType StationType(const TString& stationTypeName);
-
-    Bool_t ReadManuToSerialNbs(AliMpDetElement* detElement, 
-                       AliMp::StationType stationType);
-    Bool_t ReadDENames(AliMp::StationType stationType);
+ 
+    Bool_t ReadDENames(AliMp::StationType stationType, 
+                       AliMq::Station12Type station12Type = AliMq::kNotSt12);
     void   FillDEs();
 
     // static data members     
@@ -64,7 +64,8 @@ class AliMpDEStore : public  TObject {
     static const char    fgkCommentPrefix; ///< Comment prefix in DE names file
 
     // data members    
-    AliMpExMap fDetElements; ///< Map between DE Ids and DE objects
+    const AliMpDataStreams&  fkDataStreams; //!< Data streams
+    AliMpExMap  fDetElements; ///< Map between DE Ids and DE objects
       
   ClassDef(AliMpDEStore,1)  // The manager class for definition of detection element types
 };