1. Added getting detElemId in StepManager, to be stored later in the hit. 2.Added...

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

diff --git a/MUON/AliMUONv1.h b/MUON/AliMUONv1.h
index 21d0e3d0f4a0509972fe3db2defb87a57420faf5..ce7410bb7ccfc9884d4728f28d22816c462fc110 100644 (file)
--- a/MUON/AliMUONv1.h
+++ b/MUON/AliMUONv1.h
@@ -4,23 +4,24 @@
  * See cxx source for full Copyright notice                               */
 
 /* $Id$ */
+// Revision of includes 07/05/2004
 
 /////////////////////////////////////////////////////////
 //  Manager and hits classes for set:MUON version 1    //
 /////////////////////////////////////////////////////////
  
-#include "TLorentzVector.h"
+#include <TLorentzVector.h>
 
 #include "AliMUON.h"
 
 class TF1;
 class TGeoCombiTrans;
-
 class TString;
 class TGeoHMatrix;
 
-class AliMUONv1 : public AliMUON {
-public:
+class AliMUONv1 : public AliMUON 
+{
+ public:
    AliMUONv1();
    AliMUONv1(const char *name, const char *title);
    virtual  ~AliMUONv1();
@@ -29,6 +30,7 @@ public:
    virtual void   Init();
    virtual Int_t  IsVersion() const {return 1;}
    virtual void   StepManager();
+   virtual void   FinishRun();
    void StepManagerOld();
    void SetStepManagerVersionOld(Bool_t Opt) 
      { fStepManagerVersionOld = Opt; }
@@ -36,11 +38,17 @@ public:
      { fAngleEffect = Opt; }
    void SetStepMaxInActiveGas(Float_t StepMax)
      {fStepMaxInActiveGas = StepMax; }
-protected:
+
+ protected:
+   AliMUONv1(const AliMUONv1& right);
+   AliMUONv1&  operator = (const AliMUONv1& right);
+
+   virtual Int_t  GetChamberId(Int_t volId) const;
+   TString CurrentVolumePath() const;       
+
    Bool_t  fStepManagerVersionOld; // Version of StepManager, Default is false
    Bool_t  fAngleEffect; // Angle Effect along wires, Default is true
    Float_t fStepMaxInActiveGas;    // Step max in active gas default 0.6cm
-   virtual Int_t  GetChamberId(Int_t volId) const;
 
    // StepManager 
    Float_t *  fStepSum; //!
@@ -51,16 +59,8 @@ protected:
    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)
-   TGeoCombiTrans* fGlobalTransformation; // global transformation 
-                                  // applied to the whole geometry 
-private:
-   // method
-   void PlaceVolume(const TString& name, const TString& mName, Int_t copyNo, 
-             const TGeoHMatrix& matrix, Int_t npar, Double_t* param) const;
-
-   ClassDef(AliMUONv1,1)  // MUON Detector class Version 1
-
 
+   ClassDef(AliMUONv1,3)  // MUON Detector class Version 1
 };
 #endif