X-Git-Url: http://git.uio.no/git/?p=u%2Fmrichter%2FAliRoot.git;a=blobdiff_plain;f=MUON%2FAliMUON.h;h=5bafa39cdbe6ebf0992daaac8ecce9e50617df86;hp=bef888f15125ea30804cc382f109ec6ecdfddb09;hb=43d7561d06e1a67bca2d5e57a8136db164b45dbc;hpb=e93b11d042b2c9b554d8e6fbef302e7981fdeeba

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index bef888f1512..5bafa39cdbe 100644
--- 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,37 +15,33 @@
 #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 AliMUONTriggerCircuit;
-class AliMUONTriggerCircuitNew;
-class AliMUONData;
 class AliMUONResponse;
 class AliMUONSegmentation;
 class AliMUONHit;
-class AliMUONRawCluster;
 class AliMUONGeometry;
 class AliMUONGeometryTransformer;
 class AliMUONGeometryBuilder;
 class AliMUONRawWriter;
 class AliMUONVGeometryBuilder;
 class AliESD;
+class AliMUONDigitMaker;
+class AliMUONVHitStore;
 
 class AliMUON : public  AliDetector 
 {
   public:
     AliMUON();
-    AliMUON(const char* name, const char *title="FactoryV4",
-            const char* sDigitizerType="sdigitizer:AliMUONSDigitizerV2",
-            const char* digitizerType="digitizer:NewDigitizerWithNoiseOldTrigger");
+    AliMUON(const char* name, const char* title);
     virtual ~AliMUON();
    
     // Geometry
@@ -58,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 
@@ -86,7 +68,8 @@ class AliMUON : public  AliDetector
     virtual void   SDigits2Digits();      
     virtual void   Hits2SDigits();
     virtual void   Digits2Raw();
-    
+    virtual Bool_t Raw2SDigits(AliRawReader* rawReader);
+
     // Trigger
                    /// Create trigger
     virtual AliTriggerDetector* CreateTriggerDetector() const
@@ -101,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);
@@ -122,55 +105,61 @@ class AliMUON : public  AliDetector
                    /// Set scaler event for trigger
     virtual void  SetTriggerScalerEvent(Bool_t scaler = true){fTriggerScalerEvent = scaler;}
 
-    // trigger response version
+                  /// Set trigger response version
     virtual void  SetTriggerResponseV1(Bool_t trigResV1 = false)
-	{fTriggerResponseV1 = trigResV1;}
+	{ fTriggerResponseV1 = trigResV1; }
     virtual Bool_t GetTriggerResponseV1() const;
-    // trigger coinc44
+                  /// Set trigger coinc44
     virtual void  SetTriggerCoinc44(Int_t trigCoinc44 = 0)
-	{fTriggerCoinc44 = trigCoinc44;}
+	{ fTriggerCoinc44 = trigCoinc44; }
     virtual Int_t GetTriggerCoinc44() const;
+                 /// Set trigger chamber efficiency by cells
+    virtual void SetTriggerEffCells(Bool_t trigEffCells = false)
+	{ fTriggerEffCells = trigEffCells; }
+    virtual Bool_t GetTriggerEffCells() const;
+                 /// Set off generation of noisy digits
+    virtual void SetDigitizerWithNoise(Int_t digitizerWithNoise)
+        { fDigitizerWithNoise = digitizerWithNoise; }
+    virtual Int_t GetDigitizerWithNoise() const; 
+    
+                 /// Parametrised tail effect in resolution histogram
+    virtual void SetTailEffect(Bool_t isTailEffect) { fIsTailEffect=isTailEffect; }
+    
+    // Set fast raw data decoder
+    virtual void SetFastDecoder(Bool_t useFastDecoder); 
+                
     
     // Getters
                   /// Return reference to Chamber \a id
     virtual AliMUONChamber& Chamber(Int_t id)
       {return *((AliMUONChamber *) (*fChambers)[id]);}
-                  /// Return reference to Circuit \a id
-    virtual AliMUONTriggerCircuit& TriggerCircuit(Int_t id)
-      {return *((AliMUONTriggerCircuit *) (*fTriggerCircuits)[id]);}
-                  /// Return reference to New Circuit \a id 
-    virtual AliMUONTriggerCircuitNew& TriggerCircuitNew(Int_t id)
-	{return *((AliMUONTriggerCircuitNew*) (*fTriggerCircuitsNew)[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);
-
-    TString SDigitizerType() const;
-    TString DigitizerType() const;
+
+    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
     AliMUON(const AliMUON& rMUON);
+    /// Not implemented
     AliMUON& operator = (const AliMUON& rhs);
 
     const AliMUONGeometry* GetGeometry() const;
 
     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
-    TObjArray*            fTriggerCircuits;    ///< List of Trigger Circuits
-    TObjArray*            fTriggerCircuitsNew; ///< List of Trigger Circuits
     AliMUONGeometryBuilder*  fGeometryBuilder; ///< Geometry builder 
-    AliMUONSegmentation*  fSegmentation;       ///< New segmentation 
    
     //
-    Bool_t   fAccCut;         ///<Transport acceptance cut
-    Float_t  fAccMin;         ///<Minimum acceptance cut used during transport
-    Float_t  fAccMax;         ///<Minimum acceptance cut used during transport
+    Bool_t   fAccCut;         ///< Transport acceptance cut
+    Float_t  fAccMin;         ///< Minimum acceptance cut used during transport
+    Float_t  fAccMax;         ///< Minimum acceptance cut used during transport
     //  
     //  Stepping Parameters
     Float_t fMaxStepGas;      ///< Maximum step size inside the chamber gas
@@ -182,17 +171,23 @@ class AliMUON : public  AliDetector
     Int_t fMaxIterPad;        ///< Maximum pad index
     Int_t fCurIterPad;        ///< Current pad index
    
-    // setting scaler for trigger
+    // Options
     Bool_t fTriggerScalerEvent; ///< Flag to generates scaler event
     Bool_t fTriggerResponseV1;  ///< Flag to select TriggerResponseV1
     Int_t  fTriggerCoinc44;     ///< Flag to select TriggerCoinc44 
-    
-    TString fSDigitizerType;    ///< Class to use for SDigitizer
-    TString fDigitizerType;     ///< Class to use for Digitizer
+    Bool_t fTriggerEffCells;    ///< Flag to select TriggerEffCells
+    Int_t  fDigitizerWithNoise; ///< Flag to switch on/off generation of noisy digits
+    Bool_t fIsTailEffect;       ///< Switch to turn on/off the tail effect
     
     AliMUONRawWriter* fRawWriter; //!< Raw data writer
     
-    ClassDef(AliMUON,13)  // MUON Detector base class
+    AliMUONDigitMaker* fDigitMaker; //!< pointer to the digit maker 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