Changeset 1337 for trunk/examples/extended/eventgenerator/exgps/exGPS.cc

Timestamp:

Sep 30, 2010, 2:47:17 PM (14 years ago)

Author:

garnier

Message:

tag geant4.9.4 beta 1 + modifs locales

File:

• trunk/examples/extended/eventgenerator/exgps/exGPS.cc (modified) (4 diffs)

trunk/examples/extended/eventgenerator/exgps/exGPS.cc

@@ -26 +26 @@
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
-#include "G4UIterminal.hh"
-#include "G4UItcsh.hh"
 
 #ifdef G4UI_USE_XM
@@ -39 +37 @@
 #ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
+#endif
+
+#ifdef G4UI_USE
+#include "G4UIExecutive.hh"
 #endif
 
@@ -72 +74 @@
   runManager->SetUserAction(eventAction);
   
-  G4UIsession* session=0;
-  
-  if (argc==1)   // Define UI session for interactive mode.
-    {
-      // G4UIterminal is a (dumb) terminal.
-#ifdef G4UI_USE_XM
-      session = new G4UIXm(argc,argv);
-#else           
-#ifdef G4UI_USE_TCSH
-      session = new G4UIterminal(new G4UItcsh);      
-#else
-      session = new G4UIterminal();
-#endif
-#endif
-    }
-  
+  //Initialize G4 kernel
+  runManager->Initialize();
+    
   // visualization manager
 #ifdef G4VIS_USE
@@ -94 +83 @@
 #endif
     
-  //Initialize G4 kernel
-  runManager->Initialize();
-    
   // get the pointer to the User Interface manager 
-  G4UImanager* UI = G4UImanager::GetUIpointer();  
+  G4UImanager* UImanager = G4UImanager::GetUIpointer();  
   // UI->ApplyCommand("/control/execute display.mac");    
 
-  if (session)   // Define UI session for interactive mode.
+  if (argc!=1)   // batch mode
     {
-      // G4UIterminal is a (dumb) terminal.
-      session->SessionStart();
-      delete session;
-    }
-  else           // Batch mode
-    { 
       G4String command = "/control/execute ";
       G4String fileName = argv[1];
-      UI->ApplyCommand(command+fileName);
+      UImanager->ApplyCommand(command+fileName);    
     }
-  
+  else
+    {  // interactive mode : define UI session
+#ifdef G4UI_USE
+      G4UIExecutive* ui = new G4UIExecutive(argc, argv);
+      ui->SessionStart();
+      delete ui;
+#endif
+    }
+
   // job termination