Changeset 1337 for trunk/examples/extended/field/field01/field01.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/field/field01/field01.cc (modified) (5 diffs)

trunk/examples/extended/field/field01/field01.cc

@@ -25 +25 @@
 //
 //
-// $Id: field01.cc,v 1.8 2006/06/29 17:15:22 gunter Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: field01.cc,v 1.9 2010/05/12 16:30:59 allison Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 // 
@@ -40 +40 @@
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
-#include "G4UIterminal.hh"
 #include "Randomize.hh"
-
-#ifdef G4VIS_USE
-#include "G4VisExecutive.hh"
-#endif
 
 #include "F01DetectorConstruction.hh"
@@ -55 +50 @@
 #include "F01SteppingAction.hh"
 #include "F01SteppingVerbose.hh"
+
+#ifdef G4VIS_USE
+#include "G4VisExecutive.hh"
+#endif
+
+#ifdef G4UI_USE
+#include "G4UIExecutive.hh"
+#endif
 
 int main(int argc,char** argv) 
@@ -82 +85 @@
   runManager->SetUserInitialization(new F01PhysicsList(detector));
   
-#ifdef G4VIS_USE
-
-  // visualization manager
-
-  G4VisManager* visManager = new G4VisExecutive;
-  visManager->Initialize();
-
-#endif 
- 
   // Set user action classes
 
@@ -110 +104 @@
   runManager->Initialize();
     
+#ifdef G4VIS_USE
+
+  // visualization manager
+
+  G4VisManager* visManager = new G4VisExecutive;
+  visManager->Initialize();
+
+#endif 
+ 
   // Get the pointer to the User Interface manager 
 
-  G4UImanager* UI = G4UImanager::GetUIpointer();  
+  G4UImanager* UImanager = G4UImanager::GetUIpointer();  
  
-  if (argc==1)   // Define UI terminal for interactive mode  
-  { 
-     G4UIsession * session = new G4UIterminal;
-     session->SessionStart();
-     delete session;
-  }
-  else           // Batch mode
-  { 
-     G4String command = "/control/execute ";
-     G4String fileName = argv[1];
-     UI->ApplyCommand(command+fileName);
-  }
-    
+  if (argc!=1)   // batch mode
+    {
+      G4String command = "/control/execute ";
+      G4String fileName = argv[1];
+      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