X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUON.h;h=fb7042c21e16c57b99d9fc4262fb7b26b71f2d1f;hb=d8171ef5bd201fca88ec174418e26c88926df1d6;hp=34f30fded5af3ceadc900d318820d6d38d2519d7;hpb=8c0b5e70eaf4af646346ce107d408237194cb59d;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUON.h b/MUON/AliMUON.h
index 34f30fded5a..fb7042c21e1 100644
--- 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,29 +12,26 @@
 /// simulation data management 
  
 
-#include <TObjArray.h>
-
 #include "AliDetector.h"
 #include "AliMUONChamber.h"
 #include "AliMUONTrigger.h"
 
-#include <TVectorfwd.h>
-
-class TFile;
-class TTree;
+#include <TString.h>
 
-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 AliLoader;
+
+class TObjArray;
 
 class AliMUON : public  AliDetector 
 {
@@ -47,7 +44,6 @@ class AliMUON : public  AliDetector
     void AddGeometryBuilder(AliMUONVGeometryBuilder* geomBuilder);
     void ResetGeometryBuilder();
     
-    virtual void   BuildGeometry();
     
                    /// Return geometry builder
     AliMUONGeometryBuilder*            GetGeometryBuilder() const {return fGeometryBuilder;}
@@ -100,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;}
 
@@ -117,19 +116,29 @@ 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; }
     
     // Getters
                   /// Return reference to Chamber \a id
     virtual AliMUONChamber& Chamber(Int_t id)
       {return *((AliMUONChamber *) (*fChambers)[id]);}
-                  /// Return reference to New Circuit \a id 
 
     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);
@@ -145,9 +154,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
@@ -160,19 +169,28 @@ 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
-    
+    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
+
     AliMUONRawWriter* fRawWriter; //!< Raw data writer
     
     AliMUONDigitMaker* fDigitMaker; //!< pointer to the digit maker class
 
     AliMUONVHitStore* fHitStore; //!< container of hits
     
-    ClassDef(AliMUON,15)  // MUON Detector base class
+    TString fDigitStoreConcreteClassName; ///< to be able to select what the sdigitizer uses
+    
+    AliMUONCalibrationData* fCalibrationData; ///< pointer of calibration data
+
+  AliMUONDigitCalibrator* fDigitCalibrator; ///< digit calibrator (for raw2sdigits)
+  
+    ClassDef(AliMUON,23)  // MUON Detector base class
 };
 #endif