From a7bb59a2807d18623297d38deb794356a893a61a Mon Sep 17 00:00:00 2001
From: morsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Date: Fri, 30 Jan 2004 17:00:54 +0000
Subject: [PATCH] Compiling option WITH_ROOT added (Andrei Gheata).

---
 TFluka/TFluka.cxx | 2 +-
 TFluka/bxdraw.cxx | 6 ++++++
 TFluka/eedraw.cxx | 6 ++++++
 TFluka/endraw.cxx | 6 ++++++
 TFluka/magfld.cxx | 2 +-
 TFluka/mgdraw.cxx | 6 ++++++
 TFluka/sodraw.cxx | 6 ++++++
 TFluka/source.cxx | 5 +++++
 TFluka/stupre.cxx | 5 +++++
 TFluka/usdraw.cxx | 6 ++++++
 10 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/TFluka/TFluka.cxx b/TFluka/TFluka.cxx
index d326d11f9f3..0061408c92f 100644
--- a/TFluka/TFluka.cxx
+++ b/TFluka/TFluka.cxx
@@ -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();
diff --git a/TFluka/bxdraw.cxx b/TFluka/bxdraw.cxx
index 7db50079d87..625eb4120b4 100644
--- a/TFluka/bxdraw.cxx
+++ b/TFluka/bxdraw.cxx
@@ -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
diff --git a/TFluka/eedraw.cxx b/TFluka/eedraw.cxx
index 6ad890a0edf..bf243a5830c 100644
--- a/TFluka/eedraw.cxx
+++ b/TFluka/eedraw.cxx
@@ -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
diff --git a/TFluka/endraw.cxx b/TFluka/endraw.cxx
index ff72ceb8f8f..a23f67c3342 100644
--- a/TFluka/endraw.cxx
+++ b/TFluka/endraw.cxx
@@ -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
diff --git a/TFluka/magfld.cxx b/TFluka/magfld.cxx
index 1e2955a8543..5d300acee3c 100644
--- a/TFluka/magfld.cxx
+++ b/TFluka/magfld.cxx
@@ -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)
 {
 
 /*
diff --git a/TFluka/mgdraw.cxx b/TFluka/mgdraw.cxx
index 0697cf252cf..acdec3fd8c2 100644
--- a/TFluka/mgdraw.cxx
+++ b/TFluka/mgdraw.cxx
@@ -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
diff --git a/TFluka/sodraw.cxx b/TFluka/sodraw.cxx
index 10f4ece4a4f..8ed22143a63 100644
--- a/TFluka/sodraw.cxx
+++ b/TFluka/sodraw.cxx
@@ -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
diff --git a/TFluka/source.cxx b/TFluka/source.cxx
index 7720669332a..98bcd03e24c 100644
--- a/TFluka/source.cxx
+++ b/TFluka/source.cxx
@@ -15,7 +15,12 @@
 //#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"
diff --git a/TFluka/stupre.cxx b/TFluka/stupre.cxx
index 1f1de7f6848..1d912c291ab 100644
--- a/TFluka/stupre.cxx
+++ b/TFluka/stupre.cxx
@@ -17,7 +17,12 @@
 #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"
diff --git a/TFluka/usdraw.cxx b/TFluka/usdraw.cxx
index 83f17f7878c..4463968edad 100644
--- a/TFluka/usdraw.cxx
+++ b/TFluka/usdraw.cxx
@@ -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
-- 
2.43.0