X-Git-Url: http://git.uio.no/git/?a=blobdiff_plain;f=MUON%2FAliMUONv1.h;h=0538b0ad6fef9969f4bde385ba40ec6f9a3311b5;hb=0742685016164b4badfff3326341f1f29c07d4d8;hp=713cb17f410906eed70e4dce9c54d6e0233d675f;hpb=21590d30fe5d6e439ab0f2ff42cb9bb6cfa1e20a;p=u%2Fmrichter%2FAliRoot.git

diff --git a/MUON/AliMUONv1.h b/MUON/AliMUONv1.h
index 713cb17f410..0538b0ad6fe 100644
--- a/MUON/AliMUONv1.h
+++ b/MUON/AliMUONv1.h
@@ -6,7 +6,7 @@
 /* $Id$ */
 // Revision of includes 07/05/2004
 
-/// \ingroup base
+/// \ingroup sim
 /// \class AliMUONv1
 /// \brief AliDetector class for MUON subsystem which implements
 /// functions for simulation 
@@ -16,6 +16,7 @@
 #include <TLorentzVector.h>
 
 class TF1;
+class TF2;
 class TGeoCombiTrans;
 class TString;
 class TGeoHMatrix;
@@ -24,29 +25,41 @@ class AliMUONv1 : public AliMUON
 {
  public:
    AliMUONv1();
-   AliMUONv1(const char *name, const char *title="FactoryV4",
-           const char* sDigitizerType="sdigitizer:AliMUONSDigitizerV2",
-           const char* digitizerType="digitizer:NewDigitizerWithNoiseOldTrigger");
+   AliMUONv1(const char *name, const char* title = "default");
    virtual  ~AliMUONv1();
    virtual void   CreateGeometry();
    virtual void   CreateMaterials();
+   virtual void   AddAlignableVolumes() const;
    virtual void   Init();
+   
+                  /// Return the version number of this detector
    virtual Int_t  IsVersion() const {return 1;}
+   
    virtual void   StepManager();
 
+        /// Set option to take into account angle effect
    void SetAngleEffect(Bool_t Opt) 
      { fAngleEffect = Opt; }
+
+        /// Set option to take into account magnetic field effect
+   void SetMagEffect(Bool_t Opt) 
+     { fMagEffect = Opt; }
+        
+        /// Set max step max in active gas 
    void SetStepMaxInActiveGas(Float_t StepMax)
      {fStepMaxInActiveGas = StepMax; }
 
  protected:
+   /// Not implemented
    AliMUONv1(const AliMUONv1& right);
+   /// Not implemented
    AliMUONv1&  operator = (const AliMUONv1& right);
 
-   virtual Int_t  GetChamberId(Int_t volId) const;
+   virtual Int_t  GetGeomModuleId(Int_t volId) const;
    TString CurrentVolumePath() const;	     
 
    Bool_t  fAngleEffect;           ///< Angle Effect along wires, Default is true
+   Bool_t  fMagEffect;             ///< Magnetic Field Effect along wires, Default is true
    Float_t fStepMaxInActiveGas;    ///< Step max in active gas default 0.6cm
 
    // StepManager 
@@ -58,8 +71,9 @@ class AliMUONv1 : public AliMUON
    TF1 *          fElossRatio;    ///< Ratio of particle mean eloss with respect MIP's 
    TF1 *          fAngleEffect10; ///< Angle effect in tracking chambers at theta =10 degres as a function of ElossRatio (Khalil BOUDJEMLINE sep 2003 Ph.D Thesis) (in micrometers)  
    TF1 *          fAngleEffectNorma;///< Angle effect: Normalisation form theta=10 degres to theta between 0 and 10 (Khalil BOUDJEMLINE sep 2003 Ph.D Thesis)
-     
-   ClassDef(AliMUONv1,5)  // MUON Detector class Version 1
+   TF2 *          fMagAngleEffectNorma;///< Magnetic field effect: Normalisation from theta=16 degres to theta between -20 and 20 (Lamia Benhabib jun 2006 Master Thesis)
+    
+   ClassDef(AliMUONv1,6)  // MUON Detector class Version 1
 };
 #endif