changed binning

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

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 7cd8e798654cd5c0eefaead803b4540115e8f3b0..2763d39d729468b6ab8e42ca573dff9bb81777ea 100644 (file)
--- a/MUON/AliMUON.h
+++ b/MUON/AliMUON.h
@@ -27,6 +27,7 @@ class AliMUONVGeometryBuilder;
 class AliMUONDigitMaker;
 class AliMUONVHitStore;
 class AliMUONCalibrationData;
+class AliMUONDigitCalibrator;
 
 class AliLoader;
 
@@ -95,7 +96,10 @@ 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 gMC->SetMaxStep
+    virtual void  SetIsMaxStep(Bool_t isMaxStep) { fIsMaxStep = isMaxStep; }
+    
                    /// Set scaler event for trigger
     virtual void  SetTriggerScalerEvent(Bool_t scaler = true){fTriggerScalerEvent = scaler;}
 
@@ -112,23 +116,20 @@ class AliMUON : public  AliDetector
        { 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; }
     
-                 /// Parametrised tail effect in resolution histogram
-    virtual void SetTailEffect(Bool_t isTailEffect) { fIsTailEffect=isTailEffect; }
-    
-    // Check if using fast decoders.
-    virtual Bool_t UsingFastTrackerDecoder() const;
-    virtual Bool_t UsingFastTriggerDecoder() const;
-    
-    // Set fast raw data decoders
-    virtual void SetFastTrackerDecoder(Bool_t useFastDecoder);
-    virtual void SetFastTriggerDecoder(Bool_t useFastDecoder);
-                
-    
-    // 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]);}
@@ -171,12 +172,15 @@ class AliMUON : public  AliDetector
     Int_t fCurIterPad;        ///< Current pad index
    
     // Options
+    Bool_t fIsMaxStep;          ///< Flag to inactivate calls to gMC->SetMaxStep
     Bool_t fTriggerScalerEvent; ///< Flag to generates scaler event
     Bool_t fTriggerResponseV1;  ///< Flag to select TriggerResponseV1
     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
+    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
     
@@ -187,8 +191,10 @@ class AliMUON : public  AliDetector
     TString fDigitStoreConcreteClassName; ///< to be able to select what the sdigitizer uses
     
     AliMUONCalibrationData* fCalibrationData; ///< pointer of calibration data
-    
-    ClassDef(AliMUON,17)  // MUON Detector base class
+
+  AliMUONDigitCalibrator* fDigitCalibrator; ///< digit calibrator (for raw2sdigits)
+  
+    ClassDef(AliMUON,24)  // MUON Detector base class
 };
 #endif