Printing Detection Element Id in MUONhit method

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

diff --git a/MUON/AliMUONv1.h b/MUON/AliMUONv1.h
index 3a543b04abc39b1acf768f7eaf5c3fa7bc033e4a..3c3797c6f31cc79f48b3fbf8c53e2ae2f065ddff 100644 (file)
--- a/MUON/AliMUONv1.h
+++ b/MUON/AliMUONv1.h
@@ -30,9 +30,15 @@ class AliMUONv1 : public AliMUON
    virtual void   Init();
    virtual Int_t  IsVersion() const {return 1;}
    virtual void   StepManager();
+                  //TBR
+   virtual void   StepManager2();
    void StepManagerOld();
+                  //TBR
+   void StepManagerOld2();
    void SetStepManagerVersionOld(Bool_t Opt) 
      { fStepManagerVersionOld = Opt; }
+   void SetStepManagerVersionDE(Bool_t Opt) 
+     { fStepManagerVersionDE = Opt; }
    void SetAngleEffect(Bool_t Opt) 
      { fAngleEffect = Opt; }
    void SetStepMaxInActiveGas(Float_t StepMax)
@@ -42,10 +48,13 @@ class AliMUONv1 : public AliMUON
    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  fStepManagerVersionDE;  // Version of StepManager with DE, 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; //!
@@ -56,17 +65,8 @@ 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)
-   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 char* only) const;
-
-   ClassDef(AliMUONv1,2)  // MUON Detector class Version 1
-
 
+   ClassDef(AliMUONv1,3)  // MUON Detector class Version 1
 };
 #endif