Merge branch 'master' of https://git.cern.ch/reps/AliRoot

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

diff --git a/MUON/mapping/AliMpDDLStore.h b/MUON/mapping/AliMpDDLStore.h
index 42468dd7c7b7525d87855c7a495b185161e7f191..c3b5c1dcf7e14f48479bcac550fe041f44588c2b 100644 (file)
--- a/MUON/mapping/AliMpDDLStore.h
+++ b/MUON/mapping/AliMpDDLStore.h
@@ -18,8 +18,6 @@
 #define ALI_MP_DDL_STORE_H
 
 #include "AliMpExMap.h"
-#include "AliMpIntPair.h"
-#include "AliMpGlobalCrate.h"
 #include "AliMpRegionalTrigger.h"
 #include <TObject.h>
 #include <TObjArray.h>
@@ -31,18 +29,19 @@ class AliMpDetElement;
 class AliMpBusPatch;
 class AliMpLocalBoard;
 class AliMpTriggerCrate;
-
+class AliMpDataStreams;
 class TArrayI;
 
 class AliMpDDLStore : public  TObject {
 
   public:
-    AliMpDDLStore(TRootIOCtor* /*ioCtor*/);
+    AliMpDDLStore(TRootIOCtor* ioCtor);
     virtual ~AliMpDDLStore();
     
     // static access method
     static AliMpDDLStore* Instance(Bool_t warn = true); 
-    static AliMpDDLStore* ReadData(Bool_t warn = true);
+    static AliMpDDLStore* ReadData(const AliMpDataStreams& dataStreams,
+                                   Bool_t warn = true);
     
     // methods
     AliMpDDL*          GetDDL(Int_t ddlId, Bool_t warn = true) const;
@@ -54,8 +53,6 @@ class AliMpDDLStore : public  TObject {
 
     /// Return regional trigger object
     const AliMpRegionalTrigger*  GetRegionalTrigger() const { return &fRegionalTrigger; }
-    /// Return global crate object
-    const AliMpGlobalCrate*  GetGlobalCrate() const { return &fGlobalCrate; }
     
     Int_t  GetDEfromBus(Int_t busPatchId) const;
     Int_t  GetDEfromLocalBoard(Int_t localBoardId, Int_t chamberId) const;
@@ -64,61 +61,55 @@ class AliMpDDLStore : public  TObject {
     
     Int_t  GetDDLfromBus(Int_t busPatchId) const;
     Int_t  GetBusPatchId(Int_t detElemId, Int_t manuId) const;
-    
-    /// Return trigger crates iterator
-    TExMapIter GetTriggerCrateItr() const { return fRegionalTrigger.GetTriggerCrateItr(); }
-
-    /// Return trigger local board iterator
-    TExMapIter GetLocalBoardItr() const { return fRegionalTrigger.GetLocalBoardItr(); }
 
-    /// Get an iterator to loop over bus patches
-    TExMapIter GetBusPatchesIterator() const { return fBusPatches.GetIterator(); }
-    
-    /// Get detection elt and Manu number from serial number
-    AliMpIntPair  GetDetElemIdManu(Int_t manuSerial) const;
+    Long_t GetLinkPortId(Int_t busPatchId) const;
 
-    /// print info of all manus
+    /// Print info of all manus
     void PrintAllManu() const;
     
     // Set methods
     void SetRegionalTrigger(const AliMpRegionalTrigger& regionalTrigger);
 
+    TIterator* CreateBusPatchIterator() const; 
     
   private:
+    AliMpDDLStore(const AliMpDataStreams& dataStreams);
+    /// Not implemented
     AliMpDDLStore();
     /// Not implemented
     AliMpDDLStore(const AliMpDDLStore& rhs);
     /// Not implemented
     AliMpDDLStore& operator=(const AliMpDDLStore& rhs);
 
+    // static methods
+    static const TString&  GetRevertKeyword();
+    static const TString&  GetExplicitKeyword();
+
     // methods
     Int_t  GetManuListIndex(Int_t detElemId) const;
     Int_t  GetBusPatchIndex(Int_t detElemId, Int_t manuId) const;
-    Bool_t ReadDDLs();
-    Bool_t ReadTrigger();
+    Bool_t ReadDDLs(const AliMpDataStreams& dataStreams);
+    Bool_t ReadTrigger(const AliMpDataStreams& dataStreams);
     Bool_t SetTriggerDDLs();
     Bool_t SetManus();
-    Bool_t ReadBusPatchSpecial();
+    Bool_t ReadBusPatchSpecial(const AliMpDataStreams& dataStreams);
     Bool_t SetPatchModules();
-    Bool_t SetBusPatchLength();
+    Bool_t ReadBusPatchInfo(const AliMpDataStreams& dataStreams);
     Int_t  GetLocalBoardId(TString name) const;
 
     // static data members     
     static AliMpDDLStore* fgInstance; ///< Singleton instance
     static const Int_t    fgkNofDDLs; ///< Total number of DDLs
     static const Int_t    fgkNofTriggerDDLs; ///< Total number of trigger DDLs
-    static const TString  fgkRevertKeyword; ///< A keyword for ReadBusPatchSpecial()
-    static const TString  fgkExplicitKeyword; ///< A keyword for ReadBusPatchSpecial()
 
     // data members    
     TObjArray     fDDLs;           ///< Array of DDL objects
     AliMpExMap    fBusPatches;     ///< The map of bus patches per their IDs
     TArrayI       fManuList12[16]; ///< Arrays of 1st manu in bus
     TArrayI       fManuBridge2[16]; ///< Arrays of manu number before the bridge in buspatch
-    AliMpGlobalCrate     fGlobalCrate;     ///< Global Crate Object 
     AliMpRegionalTrigger fRegionalTrigger; ///< Regional trigger
         
-  ClassDef(AliMpDDLStore,4)  // The manager class for definition of detection element types
+  ClassDef(AliMpDDLStore,5)  // The manager class for definition of detection element types
 };
 
 #endif //ALI_MP_DDL_STORE_H