fix minor bug: add task argument was not passed to tak

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

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 3201a24bb68c0f263cfcdb25bddf7bd7403d0f3d..c6150b288df5ef2a1d94a82cd69a9fabef80ec65 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -4,7 +4,7 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
-// Revision of includes 07/05/2004
+// Revision of includes 12/01/2009
 
 /// \ingroup sim
 /// \class AliMUON
@@ -12,30 +12,27 @@
 /// simulation data management 
  
 
-#include <TObjArray.h>
-
 #include "AliDetector.h"
 #include "AliMUONChamber.h"
 #include "AliMUONTrigger.h"
 
-#include <TVectorfwd.h>
 #include <TString.h>
 
-class TFile;
-class TTree;
-
-class AliLoader;
 class AliMUONResponse;
-class AliMUONSegmentation;
-class AliMUONHit;
 class AliMUONGeometry;
 class AliMUONGeometryTransformer;
 class AliMUONGeometryBuilder;
 class AliMUONRawWriter;
 class AliMUONVGeometryBuilder;
-class AliESD;
 class AliMUONDigitMaker;
 class AliMUONVHitStore;
+class AliMUONCalibrationData;
+class AliMUONDigitCalibrator;
+class AliMUONRecoParam;
+
+class AliLoader;
+
+class TObjArray;
 
 class AliMUON : public  AliDetector 
 {
@@ -48,7 +45,6 @@ class AliMUON : public  AliDetector
     void AddGeometryBuilder(AliMUONVGeometryBuilder* geomBuilder);
     void ResetGeometryBuilder();
     
-    virtual void   BuildGeometry();
     
                    /// Return geometry builder
     AliMUONGeometryBuilder*            GetGeometryBuilder() const {return fGeometryBuilder;}
@@ -64,7 +60,7 @@ class AliMUON : public  AliDetector
     virtual void   SetSplitLevel(Int_t SplitLevel)     {fSplitLevel=SplitLevel;}
 
     // Digitisation 
-    virtual AliDigitizer* CreateDigitizer(AliRunDigitizer* manager) const;
+    virtual AliDigitizer* CreateDigitizer(AliDigitizationInput* digInput) const;
     virtual void   SDigits2Digits();      
     virtual void   Hits2SDigits();
     virtual void   Digits2Raw();
@@ -101,28 +97,40 @@ class AliMUON : public  AliDetector
     // Set alignement option
     virtual void  SetAlign(Bool_t align = true);
     virtual void  SetAlign(const TString& fileName, Bool_t align = true);
-
+    
+                    /// Set flag to inactivate calls to TVirtualMC::GetMC()->SetMaxStep
+    virtual void  SetIsMaxStep(Bool_t isMaxStep) { fIsMaxStep = isMaxStep; }
+    
                    /// Set scaler event for trigger
     virtual void  SetTriggerScalerEvent(Bool_t scaler = true){fTriggerScalerEvent = scaler;}
 
                   /// Set trigger response version
-    virtual void  SetTriggerResponseV1(Bool_t trigResV1 = false)
+    virtual void  SetTriggerResponseV1(Int_t trigResV1 = 0)
        { fTriggerResponseV1 = trigResV1; }
-    virtual Bool_t GetTriggerResponseV1() const;
+    virtual Int_t GetTriggerResponseV1() const;
                   /// Set trigger coinc44
     virtual void  SetTriggerCoinc44(Int_t trigCoinc44 = 0)
        { fTriggerCoinc44 = trigCoinc44; }
     virtual Int_t GetTriggerCoinc44() const;
                  /// Set trigger chamber efficiency by cells
-    virtual void SetTriggerEffCells(Bool_t trigEffCells = false)
+    virtual void SetTriggerEffCells(Bool_t trigEffCells = true)
        { fTriggerEffCells = trigEffCells; }
     virtual Bool_t GetTriggerEffCells() const;
                  /// Set off generation of noisy digits
-    virtual void SetDigitizerWithNoise(Int_t digitizerWithNoise)
-        { fDigitizerWithNoise = digitizerWithNoise; }
+  virtual void SetDigitizerWithNoise(Int_t digitizerWithNoise, Double_t nsigmas=4.0)
+  { fDigitizerWithNoise = digitizerWithNoise; fDigitizerNSigmas = nsigmas; }
+  
     virtual Int_t GetDigitizerWithNoise() const; 
+  
+  virtual Double_t GetDigitizerNSigmas() const { return fDigitizerNSigmas; }
+
+  /// Parametrised tail effect in resolution histogram
+  virtual void SetTailEffect(Bool_t isTailEffect) { fIsTailEffect=isTailEffect; }
     
-    // Getters
+       /// Enable trigger raw2sdigits conversion 
+       virtual void SetConvertTrigger(Bool_t convertTrigger = true) { fConvertTrigger = convertTrigger;}
+
+       // Getters
                   /// Return reference to Chamber \a id
     virtual AliMUONChamber& Chamber(Int_t id)
       {return *((AliMUONChamber *) (*fChambers)[id]);}
@@ -143,6 +151,8 @@ class AliMUON : public  AliDetector
 
     const AliMUONGeometry* GetGeometry() const;
 
+  AliMUONRecoParam* GetRecoParam() const;
+  
     Int_t                 fNCh;                ///< Number of chambers   
     Int_t                 fNTrackingCh;        ///< Number of tracking chambers*
     Int_t                 fSplitLevel;         ///< Splitlevel when making branches in outfiles.
@@ -150,9 +160,9 @@ class AliMUON : public  AliDetector
     AliMUONGeometryBuilder*  fGeometryBuilder; ///< Geometry builder 
    
     //
-    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
@@ -165,12 +175,16 @@ class AliMUON : public  AliDetector
     Int_t fCurIterPad;        ///< Current pad index
    
     // Options
+    Bool_t fIsMaxStep;          ///< Flag to inactivate calls to TVirtualMC::GetMC()->SetMaxStep
     Bool_t fTriggerScalerEvent; ///< Flag to generates scaler event
-    Bool_t fTriggerResponseV1;  ///< Flag to select TriggerResponseV1
+    Int_t  fTriggerResponseV1;  ///< Flag to select TriggerResponseV1 (for cluster size in MTR)
     Int_t  fTriggerCoinc44;     ///< Flag to select TriggerCoinc44 
     Bool_t fTriggerEffCells;    ///< Flag to select TriggerEffCells
-    Int_t fDigitizerWithNoise; ///< Flag to switch on/off generation of noisy digits
-    
+    Int_t  fDigitizerWithNoise; ///< Flag to switch on/off generation of noisy digits
+    Double_t fDigitizerNSigmas; ///< nsigma cut for noise generation
+    Bool_t fIsTailEffect;       ///< Switch to turn on/off the tail effect
+       Bool_t fConvertTrigger;     ///< Switch to enable trigger raw2sdigit conversion 
+
     AliMUONRawWriter* fRawWriter; //!< Raw data writer
     
     AliMUONDigitMaker* fDigitMaker; //!< pointer to the digit maker class
@@ -179,7 +193,11 @@ class AliMUON : public  AliDetector
     
     TString fDigitStoreConcreteClassName; ///< to be able to select what the sdigitizer uses
     
-    ClassDef(AliMUON,16)  // MUON Detector base class
+    AliMUONCalibrationData* fCalibrationData; ///< pointer of calibration data
+
+  AliMUONDigitCalibrator* fDigitCalibrator; //!< digit calibrator (for raw2sdigits)
+  
+    ClassDef(AliMUON,25)  // MUON Detector base class
 };
 #endif