Import Geant4 10.5.0.beta source tree

examples/extended/exoticphysics/ucn/ExUCN.cc

@@ -38,6 +38,8 @@
 #include <unistd.h>
 #endif
 
+#include "G4Types.hh"
+
 #include "ExUCNPhysicsList.hh"
 #include "ExUCNDetectorConstruction.hh"
 #include "ExUCNActionInitialization.hh"
@@ -53,13 +55,8 @@
 
 #include "Randomize.hh"
 
-#ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
-#endif
-
-#ifdef G4UI_USE
 #include "G4UIExecutive.hh"
-#endif
 
 //....oooOO0OOooo........oooOO0OOooo........oooOO0OOooo........oooOO0OOooo......
 
@@ -106,6 +103,12 @@ int main(int argc,char** argv)
     }
   }
 
+  // Instantiate G4UIExecutive if interactive mode
+  G4UIExecutive* ui = nullptr;
+  if ( argc == 1 ) {
+    ui = new G4UIExecutive(argc, argv);
+  }
+
   // Choose the Random engine
   //
   G4Random::setTheEngine(new CLHEP::RanecuEngine);
@@ -135,14 +138,12 @@ int main(int argc,char** argv)
   //
   runManager->Initialize();
 
-#ifdef G4VIS_USE
   // Initialize visualization
   //
   G4VisManager* visManager = new G4VisExecutive;
   // G4VisExecutive can take a verbosity argument - see /vis/verbose guidance.
   // G4VisManager* visManager = new G4VisExecutive("Quiet");
   visManager->Initialize();
-#endif
 
   // Get the pointer to the User Interface manager
   //
@@ -155,18 +156,11 @@ int main(int argc,char** argv)
   }
   else
   {  // interactive mode : define UI session
-#ifdef G4UI_USE
-     G4UIExecutive* ui = new G4UIExecutive(argc, argv, session);
-#ifdef G4VIS_USE
      UImanager->ApplyCommand("/control/execute vis.mac");
-#else
-     UImanager->ApplyCommand("/control/execute ExUCN.in");
-#endif
      if (ui->IsGUI())
         UImanager->ApplyCommand("/control/execute gui.mac");
      ui->SessionStart();
      delete ui;
-#endif
   }
 
   // Job termination
@@ -174,9 +168,7 @@ int main(int argc,char** argv)
   //                 owned and deleted by the run manager, so they should not
   //                 be deleted in the main() program !
   
-#ifdef G4VIS_USE
   delete visManager;
-#endif
   delete runManager;
 
   return 0;

examples/extended/exoticphysics/ucn/ExUCN.out

@@ -4,7 +4,7 @@
         ############################################
 
 **************************************************************
- Geant4 version Name: geant4-10-04-patch-02    (25-May-2018)
+ Geant4 version Name: geant4-10-05-beta-01    (29-June-2018)
                        Copyright : Geant4 Collaboration
                       References : NIM A 506 (2003), 250-303
                                  : IEEE-TNS 53 (2006), 270-278
@@ -1479,7 +1479,7 @@ Terminate current event processing.
  Run terminated.
 Run Summary
   Number of events processed : 1
-  User=0.05s Real=0.06s Sys=0s
+  User=0.040000s Real=0.038537s Sys=0.000000s
 Sum NoMT:                            0
 Sum NoMRT:                           0
 Sum NoMRCondition:                   0

examples/extended/exoticphysics/ucn/History

@@ -15,6 +15,11 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+May 17, 2018 J.Allison (ExUCN-V10-04-00)
+- Add #include "G4Types.hh"
+- Remove G4UI_USE and G4VIS_USE.
+- Move instantiation of G4UIExecutive to start of main.
+
 September 12, 2017  Soon Yung Jun  (ExUCN-V10-03-01)
 - ExUCNDetectorConstruction: commented out a wrong use of AddConstProperty