Import Geant4 10.5.0.beta source tree

examples/extended/biasing/GB01/History

@@ -17,6 +17,15 @@ committal in the CVS repository !
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 8th, 2018 J. Allison - GB01-V10-04-01
+- Remove G4UI_USE and G4VIS_USE.
+- Move instantiation of G4UIExecutive nearer to start of main.
+
+May 8th, 2018 B. Morgan - GB01-V10-04-00
+- Include G4Types before use of G4MULTITHREADED. For forward
+  compatibility with move to #defines over -D for G4 preprocessor
+  symbols.
+
 Nov 02, 2016 I. Hrivnacova
 - Added files description (for Doxygen)
 

examples/extended/biasing/GB01/exampleGB01.cc

@@ -29,6 +29,8 @@
 // $Id: $
 //
 
+#include "G4Types.hh"
+
 #ifdef G4MULTITHREADED
 #include "G4MTRunManager.hh"
 #else
@@ -44,13 +46,8 @@
 #include "FTFP_BERT.hh"
 #include "G4GenericBiasingPhysics.hh"
 
-#ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
-#endif
-
-#ifdef G4UI_USE
 #include "G4UIExecutive.hh"
-#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -74,7 +71,7 @@ int main(int argc,char** argv)
     PrintUsage();
     return 1;
   }
-  
+
   G4String macro("");
   G4String onOffBiasing("");
   if ( argc == 2 ) macro = argv[1];
@@ -91,9 +88,15 @@ int main(int argc,char** argv)
             }
         }
     }
-  
+
   if ( onOffBiasing == "" ) onOffBiasing = "on";
-  
+
+  // Instantiate G4UIExecutive if interactive mode
+  G4UIExecutive* ui = nullptr;
+  if (  macro == ""  ) {
+    ui = new G4UIExecutive(argc, argv);
+  }
+
   // -- Construct the run manager : MT or sequential one
 #ifdef G4MULTITHREADED
   G4MTRunManager * runManager = new G4MTRunManager;
@@ -135,40 +138,30 @@ int main(int argc,char** argv)
 
   // Initialize G4 kernel
   runManager->Initialize();
-  
 
-#ifdef G4VIS_USE
   // Initialize visualization
   G4VisManager* visManager = new G4VisExecutive;
   // G4VisExecutive can take a verbosity argument - see /vis/verbose guidance.
   visManager->Initialize();
-#endif
 
   // Get the pointer to the User Interface manager
   G4UImanager* UImanager = G4UImanager::GetUIpointer();
 
-  if ( macro != "" )   // batch mode
+  if ( !ui )   // batch mode
     {
       G4String command = "/control/execute ";
       UImanager->ApplyCommand(command+macro);
     }
   else
     {  // interactive mode : define UI session
-#ifdef G4UI_USE
-      G4UIExecutive* ui = new G4UIExecutive(argc, argv);
-#ifdef G4VIS_USE
-      //      UImanager->ApplyCommand("/control/execute vis.mac"); 
-#endif
+      //      UImanager->ApplyCommand("/control/execute vis.mac");
       //      if (ui->IsGUI())
       //        UImanager->ApplyCommand("/control/execute gui.mac");
       ui->SessionStart();
       delete ui;
-#endif
     }
 
-#ifdef G4VIS_USE
   delete visManager;
-#endif
   delete runManager;
 
   return 0;