Changes for removal of AliMpManuList (Laurent)

[u/mrichter/AliRoot.git] / MUON / AliMUON.h

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index c3dfbe5a6e088f2b99821ec521b1a81a849f3d80..3201a24bb68c0f263cfcdb25bddf7bd7403d0f3d 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -6,7 +6,7 @@
 /* $Id$ */
 // Revision of includes 07/05/2004
 
-/// \ingroup base
+/// \ingroup sim
 /// \class AliMUON
 /// \brief AliDetector class for MUON subsystem providing
 /// simulation data management 
@@ -15,21 +15,19 @@
 #include <TObjArray.h>
 
 #include "AliDetector.h"
-#include "AliMUONData.h"
 #include "AliMUONChamber.h"
 #include "AliMUONTrigger.h"
 
 #include <TVectorfwd.h>
+#include <TString.h>
 
 class TFile;
 class TTree;
 
 class AliLoader;
-class AliMUONData;
 class AliMUONResponse;
 class AliMUONSegmentation;
 class AliMUONHit;
-class AliMUONRawCluster;
 class AliMUONGeometry;
 class AliMUONGeometryTransformer;
 class AliMUONGeometryBuilder;
@@ -37,6 +35,7 @@ class AliMUONRawWriter;
 class AliMUONVGeometryBuilder;
 class AliESD;
 class AliMUONDigitMaker;
+class AliMUONVHitStore;
 
 class AliMUON : public  AliDetector 
 {
@@ -55,27 +54,13 @@ class AliMUON : public  AliDetector
     AliMUONGeometryBuilder*            GetGeometryBuilder() const {return fGeometryBuilder;}
     const AliMUONGeometryTransformer*  GetGeometryTransformer() const;
                    /// Return segmentation
-    AliMUONSegmentation*               GetSegmentation() const    { return fSegmentation; }
-
-                   /// Return MUONData   
-    AliMUONData*   GetMUONData() {return fMUONData;}
 
     // MUONLoader definition
     virtual AliLoader* MakeLoader(const char* topfoldername); //builds standard getter (AliLoader type)
 
-    // Interface with AliMUONData
-                   /// Make branch
-    virtual void   MakeBranch(Option_t *opt=" ") {GetMUONData()->MakeBranch(opt);}
     virtual void   SetTreeAddress();
-                   /// Reset hits
-    virtual void   ResetHits()                   {GetMUONData()->ResetHits();}
-                   /// Reset digits
-    virtual void   ResetDigits()                 {GetMUONData()->ResetDigits();}
-                   /// Reset trigger
-    virtual void   ResetTrigger()                {GetMUONData()->ResetTrigger();}
-                   /// Reset raw clusters
-    virtual void   ResetRawClusters()            {GetMUONData()->ResetRawClusters();}
-                   /// Set split level
+                  
+                   /// Set split level for making branches in outfiles
     virtual void   SetSplitLevel(Int_t SplitLevel)     {fSplitLevel=SplitLevel;}
 
     // Digitisation 
@@ -99,7 +84,7 @@ class AliMUON : public  AliDetector
     virtual void   SetChargeSpread(Int_t id, Float_t p1, Float_t p2);
     virtual void   SetMaxAdc(Int_t id, Int_t p1);
     // Set Response Model
-    virtual void   SetResponseModel(Int_t id, AliMUONResponse *response);
+    virtual void   SetResponseModel(Int_t id, const AliMUONResponse& response);
 
     // Set Stepping Parameters
     virtual void   SetMaxStepGas(Float_t p1);
@@ -133,21 +118,22 @@ class AliMUON : public  AliDetector
        { fTriggerEffCells = trigEffCells; }
     virtual Bool_t GetTriggerEffCells() const;
                  /// Set off generation of noisy digits
-    virtual void SetDigitizerWithNoise(Bool_t digitizerWithNoise)
+    virtual void SetDigitizerWithNoise(Int_t digitizerWithNoise)
         { fDigitizerWithNoise = digitizerWithNoise; }
-    virtual Bool_t GetDigitizerWithNoise() const; 
+    virtual Int_t GetDigitizerWithNoise() const; 
     
     // Getters
                   /// Return reference to Chamber \a id
     virtual AliMUONChamber& Chamber(Int_t id)
       {return *((AliMUONChamber *) (*fChambers)[id]);}
-                  /// Return reference to New Circuit \a id 
 
-    // Return pointers to digit
-    AliMUONRawCluster    *RawCluster(Int_t ichamber, Int_t icathod,
-                                    Int_t icluster);
-    // Inherited and overridden from AliModule:
-    //PH    virtual void RemapTrackHitIDs(Int_t * map);
+    virtual void MakeBranch(Option_t* opt=" ");
+    virtual void ResetHits();
+    
+                 /// Set digit store class name           
+    void SetDigitStoreClassName(const char* classname) { fDigitStoreConcreteClassName = classname; }
+                 /// Return digit store class name           
+    const TString DigitStoreClassName() const { return fDigitStoreConcreteClassName; }
     
   protected:
     /// Not implemented
@@ -159,11 +145,9 @@ class AliMUON : public  AliDetector
 
     Int_t                 fNCh;                ///< Number of chambers   
     Int_t                 fNTrackingCh;        ///< Number of tracking chambers*
-    AliMUONData*          fMUONData;           ///< Data container for MUON subsystem  
     Int_t                 fSplitLevel;         ///< Splitlevel when making branches in outfiles.
     TObjArray*            fChambers;           ///< List of Tracking Chambers
     AliMUONGeometryBuilder*  fGeometryBuilder; ///< Geometry builder 
-    AliMUONSegmentation*  fSegmentation;       ///< New segmentation 
    
     //
     Bool_t   fAccCut;         ///<Transport acceptance cut
@@ -185,13 +169,17 @@ class AliMUON : public  AliDetector
     Bool_t fTriggerResponseV1;  ///< Flag to select TriggerResponseV1
     Int_t  fTriggerCoinc44;     ///< Flag to select TriggerCoinc44 
     Bool_t fTriggerEffCells;    ///< Flag to select TriggerEffCells
-    Bool_t fDigitizerWithNoise; ///< Flag to switch on/off generation of noisy digits
+    Int_t fDigitizerWithNoise; ///< Flag to switch on/off generation of noisy digits
     
     AliMUONRawWriter* fRawWriter; //!< Raw data writer
     
     AliMUONDigitMaker* fDigitMaker; //!< pointer to the digit maker class
 
-    ClassDef(AliMUON,13)  // MUON Detector base class
+    AliMUONVHitStore* fHitStore; //!< container of hits
+    
+    TString fDigitStoreConcreteClassName; ///< to be able to select what the sdigitizer uses
+    
+    ClassDef(AliMUON,16)  // MUON Detector base class
 };
 #endif