Import Geant4 10.5.0.beta source tree

examples/extended/parameterisations/Par02/History

@@ -15,6 +15,11 @@ track of all tags.
      * Reverse chronological order (last date on top), please *
      ----------------------------------------------------------
 
+17-05-18 J.Allison (expar02-V10-04-00)
+- Add #include "G4Types.hh"
+- Remove G4UI_USE and G4VIS_USE.
+- Move instantiation of G4UIExecutive to start of main.
+
 14-10-16 G.Folger                                 (expar02-V10-02-01)
 - remove direct use of theParticleIterator, use GetParticleTableIterator().
     fix required by clang39 on Linux and MAC

examples/extended/parameterisations/Par02/examplePar02.cc

@@ -40,6 +40,8 @@
 //
 //-------------------------------------------------------------------
 
+#include "G4Types.hh"
+
 #include "G4UImanager.hh"
 #ifdef G4MULTITHREADED
 #include "G4MTRunManager.hh"
@@ -51,17 +53,17 @@
 #include "Par02PhysicsList.hh"
 #include "Par02ActionInitialization.hh"
 
-#ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
-#endif
-
-#ifdef G4UI_USE
 #include "G4UIExecutive.hh"
-#endif
-
 
 int main( int argc, char** argv ) {
 
+  // Instantiate G4UIExecutive if interactive mode
+  G4UIExecutive* ui = nullptr;
+  if ( argc == 1 ) {
+    ui = new G4UIExecutive(argc, argv);
+  }
+
   //-------------------------------
   // Initialization of Run manager
   //-------------------------------
@@ -97,21 +99,16 @@ int main( int argc, char** argv ) {
   //----------------
   // Visualization:
   //----------------
-  #ifdef G4VIS_USE
   G4cout << "Instantiating Visualization Manager......." << G4endl;
   G4VisManager* visManager = new G4VisExecutive;
   visManager->Initialize();
-  #endif
 
-  if ( argc == 1 ) {
+  if ( ui ) {
     //--------------------------
     // Define (G)UI
     //--------------------------
-    #ifdef G4UI_USE
-    G4UIExecutive * ui = new G4UIExecutive( argc, argv );
     ui->SessionStart();
     delete ui;
-    #endif
   } else {
     G4String command = "/control/execute ";
     G4String fileName = argv[1];
@@ -123,9 +120,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/parameterisations/Par02/examplePar02.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
@@ -31,6 +31,8 @@ ecal !!!
 
 ecal !!!
 
+ecal !!!
+
 hcal !!!
 
 hcal !!!
@@ -43,8 +45,6 @@ hcal !!!
 
 tracker !!!
 
-ecal !!!
-
 ecal !!!
 Warning : Region <MuonEndCap_1> does not have specific production cuts,
 even though it appears in the current tracking world.