Changeset 1337 for trunk/examples/extended/analysis/N03Con/exampleN03Con.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/analysis/N03Con/exampleN03Con.cc (modified) (6 diffs)

trunk/examples/extended/analysis/N03Con/exampleN03Con.cc

@@ -25 +25 @@
 //
 //
-// $Id: exampleN03Con.cc,v 1.2 2007/05/26 00:24:09 tkoi Exp $
-// GEANT4 tag $Name: geant4-09-03-cand-01 $
+// $Id: exampleN03Con.cc,v 1.4 2010/05/12 12:45:06 allison Exp $
+// GEANT4 tag $Name: geant4-09-04-beta-01 $
 //
 //
@@ -34 +34 @@
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
-#include "G4UIterminal.hh"
-#include "G4UItcsh.hh"
-
-#ifdef G4UI_USE_XM
-#include "G4UIXm.hh"
-#endif
-
-#ifdef G4UI_USE_WIN32
-#include "G4UIWin32.hh"
-#endif
 
 #include "Randomize.hh"
@@ -49 +39 @@
 #ifdef G4VIS_USE
 #include "G4VisExecutive.hh"
+#endif
+
+#ifdef G4UI_USE
+#include "G4UIExecutive.hh"
 #endif
 
@@ -84 +78 @@
   runManager->SetUserInitialization(physics);
 
-  G4UIsession* session=0;
-  
-  if (argc==1)   // Define UI session for interactive mode.
-    {
-      // G4UIterminal is a (dumb) terminal
-      //
-#if defined(G4UI_USE_XM)
-      session = new G4UIXm(argc,argv);
-#elif defined(G4UI_USE_WIN32)
-      session = new G4UIWin32();
-#elif defined(G4UI_USE_TCSH)
-      session = new G4UIterminal(new G4UItcsh);      
-#else
-      session = new G4UIterminal();
-#endif
-    }
-  
-#ifdef G4VIS_USE
-  // Visualization manager
-  //
-  G4VisManager* visManager = new G4VisExecutive;
-  visManager->Initialize();
-#endif
-    
   // Set user action classes
   //
@@ -127 +97 @@
   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 (session)   // Define UI session for interactive mode
+  if (argc!=1)   // batch mode
     {
-      // G4UIterminal is a (dumb) terminal
-      //
-      // UI->ApplyCommand("/control/execute vis.mac");    
-#if defined(G4UI_USE_XM) || defined(G4UI_USE_WIN32)
-      // Customize the G4UIXm,Win32 menubar with a macro file
-      //
-      // UI->ApplyCommand("/control/execute visTutor/gui.mac");
-#endif
-      session->SessionStart();
-      delete session;
-    }
-  else           // Batch mode
-    { 
 #ifdef G4VIS_USE
       visManager->SetVerboseLevel("quiet");
@@ -151 +115 @@
       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
     }