- Fix bug in reading back trees (Laurent)

[u/mrichter/AliRoot.git] / TFluka / TFlukaMCGeometry.h

diff --git a/TFluka/TFlukaMCGeometry.h b/TFluka/TFlukaMCGeometry.h
index d23a32f1a5798ccf71da1ec91c2e421b73544605..1ef55fafb3f91d00c46cc58958024ef9024aa945 100644 (file)
--- a/TFluka/TFlukaMCGeometry.h
+++ b/TFluka/TFlukaMCGeometry.h
@@ -31,6 +31,7 @@ class TFlukaMCGeometry :public TNamed {
     virtual ~TFlukaMCGeometry();
   
     // get methods
+    Int_t         GetNstep();  // to be removed
     Int_t         GetMedium() const;
     Int_t        *GetRegionList(Int_t imed, Int_t &nreg);
     Int_t        *GetMaterialList(Int_t imat, Int_t &nreg);
@@ -43,9 +44,12 @@ class TFlukaMCGeometry :public TNamed {
     void          PrintHeader(ofstream &out, const char *text) const;
     Bool_t        IsDebugging() const {return fDebug;}
     void          SetDebugMode(Bool_t flag=kTRUE) {fDebug = flag;}
-    void          SetMreg(Int_t mreg);
+    void          SetMreg(Int_t mreg, Int_t lttc);
     void          SetCurrentRegion(Int_t mreg, Int_t latt);
     void          GetCurrentRegion(Int_t &mreg, Int_t &latt) const {mreg=fCurrentRegion; latt=fCurrentLattice;}
+    Int_t         GetCurrentRegion() const {return fCurrentRegion;}
+    Int_t         GetDummyRegion() const {return fDummyRegion;}
+    Int_t         GetDummyLattice() const {return kLttcVirtual;}
     void          SetNextRegion(Int_t mreg, Int_t latt);
     void          GetNextRegion(Int_t &mreg, Int_t &latt) const {mreg=fNextRegion; latt=fNextLattice;}
     TGeoMaterial *GetMakeWrongMaterial(Double_t z);
@@ -63,12 +67,14 @@ class TFlukaMCGeometry :public TNamed {
     void     Vname(const char *name, char *vname) const;
    
   private:
+    // Copy constructor and operator= declared but not implemented (-Weff++ flag)
     TFlukaMCGeometry(const TFlukaMCGeometry& rhs);
-    TFlukaMCGeometry& operator=(const TFlukaMCGeometry& rhs) {return (*this);}
+    TFlukaMCGeometry& operator=(const TFlukaMCGeometry& /*rhs*/); // {return (*this);}
 
     static TFlukaMCGeometry*  fgInstance; // singleton instance
     Bool_t       fDebug;                  // debug flag
     Int_t        fLastMaterial;           // last FLUKA material index
+    Int_t        fDummyRegion;            // index of dummy region
     Int_t        fCurrentRegion;          // current region number
     Int_t        fCurrentLattice;         // current lattice history
     Int_t        fNextRegion;             // next region number
@@ -77,6 +83,7 @@ class TFlukaMCGeometry :public TNamed {
     Int_t        fIndmat;                 // material index where pemf file creation starts
     TObjArray   *fMatList;                //! material list as known by FLUKA
     TObjArray   *fMatNames;               //! list of FLUKA material names
+    
   ClassDef(TFlukaMCGeometry,1)  //Virtual MonteCarlo Interface
 };