Changeset 1230 for trunk/examples/extended/analysis/A01/A01app.cc

Timestamp:

Jan 8, 2010, 3:02:48 PM (14 years ago)

Author:

garnier

Message:

update to geant4.9.3

File:

• trunk/examples/extended/analysis/A01/A01app.cc (modified) (6 diffs)

trunk/examples/extended/analysis/A01/A01app.cc

@@ -24 +24 @@
 // ********************************************************************
 //
-// $Id: A01app.cc,v 1.8 2006/11/06 19:46:06 allison Exp $
+// $Id: A01app.cc,v 1.9 2009/11/14 14:41:13 allison Exp $
 // --------------------------------------------------------------
 //
@@ -37 +37 @@
 #include "G4RunManager.hh"
 #include "G4UImanager.hh"
-#include "G4UIterminal.hh"
-#ifdef G4UI_USE_TCSH
-#include "G4UItcsh.hh"
-#endif
 
 #include "A01DetectorConstruction.hh"
@@ -52 +48 @@
 #endif
 
-//OSC:begin
-#include <G4Lab/UIOnX.h>
-#include "A01AnalysisManager.hh"
-#include <AIDA/IAnalysisFactory.h>
-//OSC:end
+#ifdef G4UI_USE
+#include "G4UIExecutive.hh"
+#endif
 
 int main(int argc,char** argv)
@@ -62 +56 @@
   // RunManager construction
   G4RunManager* runManager = new G4RunManager;
-
-//OSC:begin
-  G4UIsession* session = 0;
-  if (argc!=1) {   // batch mode
-  A01AnalysisManager::setAIDA(AIDA_createAnalysisFactory());
-  } else {
-  std::string GUI_onx = "main.onx";
-  //std::string GUI_onx = "simple_main.onx";
-  G4Lab::UIOnX* uiOnX = new G4Lab::UIOnX(*runManager,GUI_onx,argc,argv);
-  // Enforce the creation of the GUI here, else
-  // the AIDA plotter factory will create its own
-  // that will interfer with the G4Lab::UIOnX one.
-  uiOnX->createUI();
-  A01AnalysisManager::setAIDA(uiOnX->findAIDA());
-  session = uiOnX;
-  }
-//OSC:end
 
 #ifdef G4VIS_USE
@@ -110 +87 @@
   // start interactive session
   {
-#ifdef G4UI_USE_TCSH
-    G4UIsession* session = new G4UIterminal(new G4UItcsh);
-#else
-//OSC:begin
-//    G4UIsession* session = new G4UIterminal();
-//OSC:end
+#ifdef G4UI_USE
+    G4UIExecutive* ui = new G4UIExecutive(argc, argv);
+    ui->SessionStart();
+    delete ui;
 #endif
-    session->SessionStart();
-//OSC:begin
-//    delete session;
-//OSC:end
   }
 
@@ -129 +100 @@
   delete runManager;
 
-//OSC:begin
-  // The delete of the run manager may induce,
-  // through the user action classes,
-  // a delete / closing of the AIDA resources
-  // as AIDA trees and various factories.
-  // Then we delete the UIOnX that manages the
-  // AIDA implementation after the delete
-  // of the G4 run manager.
-  delete session;
-//OSC:end
-
   return 0;
 }