Cleanup of output messages...

[u/mrichter/AliRoot.git] / Flugg / FluggNavigator.cxx

diff --git a/Flugg/FluggNavigator.cxx b/Flugg/FluggNavigator.cxx
index 6e4b26e3dd227e4b375a1f6ba1ffbf468e3fbac3..755e4dc6fac5b0428bc7befa25879335b83fd947 100644 (file)
--- a/Flugg/FluggNavigator.cxx
+++ b/Flugg/FluggNavigator.cxx
@@ -30,26 +30,39 @@
 #include "G4ios.hh"
 #include "g4std/iomanip"
 
-#define G4DEBUG_NAVIGATION 1
-#define G4VERBOSE 1
+#ifdef G4GEOMETRY_DEBUG
+# define G4DEBUG_NAVIGATION 1
+# define G4VERBOSE 1
+#endif
 
 FluggNavigator::FluggNavigator() : 
   G4Navigator()
 {
+#ifdef G4GEOMETRY_DEBUG
   G4cout << "==> Flugg FluggNavigator constructor" << G4endl;
-  G4cout << "\t+fHistory=" << fHistory << ") ..." << G4endl;
+#endif
+
   ResetStackAndState();
+
+#ifdef G4GEOMETRY_DEBUG
   G4cout << "<== Flugg FluggNavigator constructor" << G4endl;
+#endif
 }
     
 void FluggNavigator::UpdateNavigatorHistory(const G4NavigationHistory* newNavHistory)
 {
+#ifdef G4GEOMETRY_DEBUG
   cout << "==> Flugg FluggNavigator::UpdateNavigatorHistory(" << newNavHistory 
        << ")" << endl;
   cout << "\t+fHistory=" << fHistory << ") ..." << G4endl;
+#endif
+
   ResetStackAndState();
   fHistory = *newNavHistory;
   SetupHierarchy();
+
+#ifdef G4GEOMETRY_DEBUG
   cout << "<== Flugg FluggNavigator::UpdateNavigatorHistory(" << newNavHistory 
        << ")" << endl;
+#endif
 }