MediumId() implemented.

diff --git a/TFluka/TFluka.cxx b/TFluka/TFluka.cxx
index b92433fcea8cd06f526b56b28edd23b72674a8df..cffed422ae333fbddad944b4bc3049b8373687f5 100644 (file)
--- a/TFluka/TFluka.cxx
+++ b/TFluka/TFluka.cxx
@@ -492,6 +492,8 @@ void TFluka::Mixture(Int_t& kmat, const char *name, Double_t *a,
   // In this case, WMAT in output is changed to relative
   // weigths.
   //
+    printf("Mixture %5d %10s %5d \n", kmat, name, nlmat);
+    
   Int_t i,j;
   if (nlmat < 0) {
      nlmat = - nlmat;
@@ -588,7 +590,8 @@ void TFluka::Mixture(Int_t& kmat, const char *name, Double_t *a,
      delete [] wmatnew;
      return;     
    }
-   gGeoManager->Mixture(name, a, z, dens, nlmat, wmat, kmat);
+  printf("Mixture (2) %5d %10s %5d \n", kmat, name, nlmat);
+  gGeoManager->Mixture(name, a, z, dens, nlmat, wmat, kmat);
 } 
 
 //______________________________________________________________________________ 
@@ -2019,6 +2022,19 @@ const char* TFluka::VolName(Int_t id) const
    return fMCGeo->VolName(id);
 }
 
+Int_t TFluka::MediumId(const Text_t* mediumName) const
+{
+    //
+    // Return the unique medium id for medium with name mediumName
+    TList *medlist = gGeoManager->GetListOfMedia();
+    TGeoMedium* med = (TGeoMedium*) medlist->FindObject(mediumName);
+    if (med) {
+       return (med->GetId());
+    } else {
+       return (-1);
+    }
+}
+
 //______________________________________________________________________________ 
 Int_t TFluka::VolId(const Text_t* volName) const
 {

diff --git a/TFluka/TFluka.h b/TFluka/TFluka.h
index 7909d0cd71291a56bb24028c7d481453363262ed..c3edc798ad18f46cfc8ec3660041e04f0c1e55b0 100644 (file)
--- a/TFluka/TFluka.h
+++ b/TFluka/TFluka.h
@@ -168,6 +168,9 @@ class TFluka : public TVirtualMC {
   virtual const  char* VolName(Int_t id) const;
   virtual Int_t  NofVolumes() const {return fNVolumes;}
   virtual Int_t  VolId2Mate(Int_t id) const;
+  // Return the unique numeric identifier for medium name mediumName
+  virtual Int_t MediumId(const Text_t* mediumName) const;
+
   //
   // Methods for physics management
   // ------------------------------------------------