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

Timestamp:

Nov 27, 2008, 4:56:05 PM (15 years ago)

Author:

garnier

Message:

make 3.80 added because 3.81 is bad

File:

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

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

@@ -52 +52 @@
 #endif
 
+//OSC:begin
+#include <G4Lab/UIOnX.h>
+#include "A01AnalysisManager.hh"
+#include <AIDA/IAnalysisFactory.h>
+//OSC:end
+
 int main(int argc,char** argv)
 {
   // 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
@@ -90 +113 @@
     G4UIsession* session = new G4UIterminal(new G4UItcsh);
 #else
-    G4UIsession* session = new G4UIterminal();
+//OSC:begin
+//    G4UIsession* session = new G4UIterminal();
+//OSC:end
 #endif
     session->SessionStart();
-    delete session;
+//OSC:begin
+//    delete session;
+//OSC:end
   }
 
@@ -102 +129 @@
   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;
 }