Option to use Flugg removed.
authormorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 7 Jul 2004 16:04:55 +0000 (16:04 +0000)
committermorsch <morsch@f7af4fe6-9843-0410-8265-dc069ae4e863>
Wed, 7 Jul 2004 16:04:55 +0000 (16:04 +0000)
12 files changed:
TFluka/abscff.cxx
TFluka/bxdraw.cxx
TFluka/eedraw.cxx
TFluka/endraw.cxx
TFluka/mgdraw.cxx
TFluka/queffc.cxx
TFluka/rfrndx.cxx
TFluka/sodraw.cxx
TFluka/source.cxx
TFluka/stupre.cxx
TFluka/stuprf.cxx
TFluka/usdraw.cxx

index 38c5fc2..9451832 100644 (file)
@@ -1,10 +1,9 @@
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Ftrackr.h"  //(TRACKR) fluka common
 #include "Fiounit.h"  //(IOUNIT) fluka common
-#include "TFlukaGeo.h"
+#include "TFluka.h"
 #include "TGeoMaterial.h"
 #include "TFlukaCerenkov.h"
-#include "TGeoManager.h"
 
 
 #ifndef WIN32
@@ -19,7 +18,7 @@ Double_t abscff(Double_t& wvlngt, Double_t& /*omgpho*/, Int_t& mmat)
 //  Return absorption length  for given photon energy and material
 //
     TFluka* fluka =  (TFluka*) gMC;
-    TGeoMaterial*    material =  (TGeoMaterial*) (gGeoManager->GetListOfMaterials())->At(fluka->GetMaterialIndex(mmat));
+    TGeoMaterial*    material =  (TGeoMaterial*) (fluka->GetFlukaMaterials())->At(fluka->GetMaterialIndex(mmat));
     TFlukaCerenkov*  cerenkov = dynamic_cast<TFlukaCerenkov*> (material->GetCerenkovProperties());
     Double_t y = (cerenkov->GetAbsorptionCoefficientByWaveLength(wvlngt));
     return (y);
index cba83ed..d40c139 100644 (file)
@@ -1,11 +1,6 @@
 #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 bf243a5..0dcb3b7 100644 (file)
@@ -1,11 +1,7 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
 
-#ifndef WITH_ROOT
 #include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
 
 #ifndef WIN32
 # define eedraw eedraw_
index a58c521..06051ac 100644 (file)
@@ -4,11 +4,7 @@
 #include "TGeoManager.h"
 #include "TFlukaCerenkov.h"
 
-#ifndef WITH_ROOT
 #include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
 
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Ftrackr.h"  //(TRACKR) fluka common
index b265ba7..570eb8f 100644 (file)
@@ -2,11 +2,7 @@
 #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
index 73c96b6..1b482c1 100644 (file)
@@ -4,7 +4,7 @@
 #include "Fopphcm.h"  //(OPPHCM) fluka common
 #include "TGeoMaterial.h"
 #include "TFlukaCerenkov.h"
-#include "TFlukaGeo.h"
+#include "TFluka.h"
 #include "TGeoManager.h"
 
 #ifndef WIN32
index e591901..9f58258 100644 (file)
@@ -1,9 +1,8 @@
 #include "Fdimpar.h"  //(DIMPAR) fluka include
 #include "Ftrackr.h"  //(TRACKR) fluka common
 #include "Fiounit.h"  //(IOUNIT) fluka common
-#include "TFlukaGeo.h"
+#include "TFluka.h"
 #include "TGeoMaterial.h"
-#include "TGeoManager.h"
 #include "TFlukaCerenkov.h"
 
 #ifndef WIN32
@@ -18,7 +17,7 @@ Double_t rfrndx(Double_t& wvlngt, Double_t& /*omgpho*/, Int_t& mmat)
 //  Return refraction index for given photon energy and material
 //
     TFluka* fluka =  (TFluka*) gMC;
-    TGeoMaterial*    material =  (TGeoMaterial*) (gGeoManager->GetListOfMaterials())->At(fluka->GetMaterialIndex(mmat));
+    TGeoMaterial*    material =  (TGeoMaterial*) (fluka->GetFlukaMaterials())->At(fluka->GetMaterialIndex(mmat));
     TFlukaCerenkov*  cerenkov = dynamic_cast<TFlukaCerenkov*> (material->GetCerenkovProperties());
     Double_t y =  (cerenkov->GetRefractionIndexByWaveLength(wvlngt));
     return (y);
index 8ed2214..94287cf 100644 (file)
@@ -1,11 +1,7 @@
 #include <Riostream.h>
 #include "TVirtualMCApplication.h"
 
-#ifndef WITH_ROOT
 #include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
 
 #ifndef WIN32
 # define sodraw sodraw_
index d81b8b5..daa41b6 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"
-#ifndef WITH_ROOT
-#include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
 
 #include "TParticle.h"
 #include "TVector3.h"
index 9f4bc4a..b1ccfc4 100644 (file)
 
 //Virtual MC
 
-#ifndef WITH_ROOT
 #include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
 
 #include "TVirtualMCStack.h"
 #include "TVirtualMCApplication.h"
index 84c9ebb..605130c 100644 (file)
 #include "Ffinuc.h"   //(FINUC)  fluka common
 
 //Virtual MC
-#ifndef WITH_ROOT
 #include "TFluka.h"
-#else
-#include "TFlukaGeo.h"
-#endif
 
 #include "TVirtualMCStack.h"
 #include "TVirtualMCApplication.h"
index 3d6ca62..e1a26c0 100644 (file)
@@ -1,11 +1,7 @@
 #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
@@ -19,14 +15,15 @@ void usdraw(Int_t& icode, Int_t& mreg,
             Double_t& xsco, Double_t& ysco, Double_t& zsco)
 {
   TFluka *fluka = (TFluka*)gMC;
+  Int_t verbosityLevel = fluka->GetVerbosityLevel();
+  Bool_t debug = (verbosityLevel>=3)?kTRUE:kFALSE;
   fluka->SetCaller(6);
   fluka->SetIcode(icode);
   fluka->SetMreg(mreg);
   fluka->SetXsco(xsco);
   fluka->SetYsco(ysco);
   fluka->SetZsco(zsco);
-  printf("USDRAW: Number of track segments:%d %d\n", 
-        TRACKR.ntrack, TRACKR.mtrack);
+  if (debug) printf("USDRAW: Number of track segments:%d %d\n", TRACKR.ntrack, TRACKR.mtrack);
 
   (TVirtualMCApplication::Instance())->Stepping();
   fluka->SetTrackIsNew(kFALSE);