Import Geant4 11.1.0 source tree

source/visualization/Tree/src/G4ASCIITree.cc

@@ -34,6 +34,8 @@
 #include "G4ASCIITreeViewer.hh"
 #include "G4ASCIITreeMessenger.hh"
 
+#define G4warn G4cout
+
 G4ASCIITree::G4ASCIITree ():
   G4VTree ("ASCIITree",
 	   "ATree",
@@ -61,7 +63,7 @@ G4VViewer* G4ASCIITree::CreateViewer (G4VSceneHandler& scene,
     new G4ASCIITreeViewer ((G4ASCIITreeSceneHandler&) scene, name);
   if (pView) {
     if (pView -> GetViewId () < 0) {
-      G4cout << "G4ASCIITree::CreateViewer: ERROR flagged by negative"
+      G4warn << "G4ASCIITree::CreateViewer: ERROR flagged by negative"
         " view id in G4ASCIITreeViewer creation."
         "\n Destroying view and returning null pointer."
            << G4endl;
@@ -70,7 +72,7 @@ G4VViewer* G4ASCIITree::CreateViewer (G4VSceneHandler& scene,
     }
   }
   else {
-    G4cout << "G4ASCIITree::CreateViewer: ERROR: null pointer on"
+    G4warn << "G4ASCIITree::CreateViewer: ERROR: null pointer on"
       " new G4ASCIITreeViewer." << G4endl;
   }
   return pView;

source/visualization/Tree/src/G4VTreeSceneHandler.cc

@@ -37,6 +37,8 @@
 #include "G4VPhysicalVolume.hh"
 #include "G4LogicalVolume.hh"
 
+#define G4warn G4cout
+
 G4int G4VTreeSceneHandler::fSceneIdCount = 0;
 // Counter for Tree scene handlers.
 
@@ -100,7 +102,7 @@ void G4VTreeSceneHandler::PreAddSolid
       // G4PhysicalVolumeModel sends volumes as it encounters them,
       // i.e., mothers before daughters, in its descent of the
       // geometry tree.  Error!
-      G4cerr << "ERROR: G4VTreeSceneHandler::PreAddSolid: Mother "
+      G4warn << "ERROR: G4VTreeSceneHandler::PreAddSolid: Mother "
 	     << ri->GetPhysicalVolume()->GetName()
 	     << ':' << ri->GetCopyNo()
 	     << " not previously encountered."