Assume that alice.inp is created in local directory.

diff --git a/TFluka/TFluka.cxx b/TFluka/TFluka.cxx
index 58198f52a2f3e86d984130db57dd73ef031e1bc3..377a51454cf3c7c996c8513e98f34a9041d57b85 100644 (file)
--- a/TFluka/TFluka.cxx
+++ b/TFluka/TFluka.cxx
@@ -570,11 +570,10 @@ void TFluka::InitPhysics()
   printf("   last FLUKA material is %g\n", fLastMaterial);
  
 // construct file names
-  TString sAliceInp = getenv("ALICE_ROOT");
-  sAliceInp +="/TFluka/input/";
+  TString sAliceCoreInp = getenv("ALICE_ROOT");
+  sAliceCoreInp +="/TFluka/input/";
   TString sAliceTmp = "flukaMat.inp";
-  TString sAliceCoreInp = sAliceInp;
-  sAliceInp += GetInputFileName();
+  TString sAliceInp = GetInputFileName();
   sAliceCoreInp += GetCoreInputFileName();
   ifstream AliceCoreInp(sAliceCoreInp.Data());
   ifstream AliceFlukaMat(sAliceTmp.Data());
@@ -2185,8 +2184,10 @@ Double_t TFluka::TrackMass() const
 // PAPROP.am = particle mass in GeV
 // TRACKR.jtrack = identity number of the particle
   Int_t caller = GetCaller();
-  if (caller != 2)  // not eedraw 
+  if (caller != 2) {  // not eedraw 
+//    cout << "JTRACK=" << TRACKR.jtrack << " mass=" << PAPROP.am[TRACKR.jtrack+6] << endl;
     return PAPROP.am[TRACKR.jtrack+6];
+  }
   else
     return -1000.0;
 }
@@ -2535,8 +2536,8 @@ const char* TFluka::CurrentVolOffName(Int_t off) const
     return name;
 }
 
-Int_t TFluka::CurrentMaterial(Float_t &a, Float_t &z, 
-                     Float_t &dens, Float_t &radl, Float_t &absl) const
+Int_t TFluka::CurrentMaterial(Float_t & /*a*/, Float_t & /*z*/, 
+                     Float_t & /*dens*/, Float_t & /*radl*/, Float_t & /*absl*/) const
 {
 //
 //  Return the current medium number

diff --git a/TFluka/TFlukaGeo.cxx b/TFluka/TFlukaGeo.cxx
index 4cf39fd4bb2a31acd5b3b62433f4916a5d04ee83..3e6e742b92f24209a24026a35179144da12324b8 100644 (file)
--- a/TFluka/TFlukaGeo.cxx
+++ b/TFluka/TFlukaGeo.cxx
@@ -545,12 +545,12 @@ void TFluka::InitPhysics()
   Double_t fCut;
   Float_t fLastMaterial = fGeom->GetLastMaterialIndex();
   printf("   last FLUKA material is %g\n", fLastMaterial);
+
 // construct file names
-  TString sAliceInp = getenv("ALICE_ROOT");
-  sAliceInp +="/TFluka/input/";
-  TString sAliceTmp ="./flukaMat.inp";
-  TString sAliceCoreInp = sAliceInp;
-  sAliceInp += GetInputFileName();
+  TString sAliceCoreInp = getenv("ALICE_ROOT");
+  sAliceCoreInp +="/TFluka/input/";
+  TString sAliceTmp = "flukaMat.inp";
+  TString sAliceInp = GetInputFileName();
   sAliceCoreInp += GetCoreInputFileName();
   ifstream AliceCoreInp(sAliceCoreInp.Data());
   ifstream AliceFlukaMat(sAliceTmp.Data());