Compiling option WITH_ROOT added (Andrei Gheata).
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 30 Jan 2004 17:00:54 +0000 (17:00 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Fri, 30 Jan 2004 17:00:54 +0000 (17:00 +0000)
TFluka/TFluka.cxx
TFluka/bxdraw.cxx
TFluka/eedraw.cxx
TFluka/endraw.cxx
TFluka/magfld.cxx
TFluka/mgdraw.cxx
TFluka/sodraw.cxx
TFluka/source.cxx
TFluka/stupre.cxx
TFluka/usdraw.cxx

index d326d11..0061408 100644 (file)
@@ -571,7 +571,7 @@ void TFluka::InitPhysics()
   TString sAliceInp = getenv("ALICE_ROOT");
   TString sAliceTmp = sAliceInp;
   sAliceInp +="/TFluka/input/";
-  sAliceTmp +="/tmp/flukaMat.inp";
+  sAliceTmp +="./flukaMat.inp";
   TString sAliceCoreInp = sAliceInp;
   sAliceInp += GetInputFileName();
   sAliceCoreInp += GetCoreInputFileName();
index 7db5007..625eb41 100644 (file)
@@ -1,5 +1,11 @@
 #include <Riostream.h>
+
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Ftrackr.h"  //(TRACKR) fluka common
 #ifndef WIN32
index 6ad890a..bf243a5 100644 (file)
@@ -1,6 +1,12 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
+
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 #ifndef WIN32
 # define eedraw eedraw_
 #else
index ff72ceb..a23f67c 100644 (file)
@@ -1,6 +1,12 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
+
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Ftrackr.h"  //(TRACKR) fluka common
 #ifndef WIN32
index 1e2955a..5d300ac 100644 (file)
@@ -13,7 +13,7 @@
 
 extern "C" void type_of_call magfld(double& x,   double& y,   double& z, 
                                    double& btx, double& bty, double& btz, double& b, 
-                                   int&    nreg,int& idisc)
+                                   int&    /*nreg*/,int& idisc)
 {
 
 /*
index 0697cf2..acdec3f 100644 (file)
@@ -1,7 +1,13 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
 #include "TVirtualMCStack.h"
+
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 // Fluka include
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Fdblprc.h"  //(DBLPRC) fluka common
index 10f4ece..8ed2214 100644 (file)
@@ -1,6 +1,12 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
+
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 #ifndef WIN32
 # define sodraw sodraw_
 #else
index 7720669..98bcd03 100644 (file)
 //#include "Fcaslim.h"  //(CASLIM) fluka common
 
 //Virutal MC
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 #include "TVirtualMCStack.h"
 #include "TVirtualMCApplication.h"
 #include "TParticle.h"
index 1f1de7f..1d912c2 100644 (file)
 #include "Ftrackr.h"  //(TRACKR) fluka common
 
 //Virtual MC
+#ifndef WITH_ROOT
 #include "TFluka.h"
+#else
+#include "TFlukaGeo.h"
+#endif
+
 #include "TVirtualMCStack.h"
 #include "TVirtualMCApplication.h"
 #include "TParticle.h"
index 83f17f7..4463968 100644 (file)
@@ -1,6 +1,12 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
+
+#ifndef WITH_ROOT
+#include "TFluka.h"
+#else
 #include "TFluka.h"
+#endif
+
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Ftrackr.h"  //(TRACKR) fluka common
 #ifndef WIN32