Changeset 1230 for trunk/examples/extended/analysis/A01

Timestamp:

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

Author:

garnier

Message:

update to geant4.9.3

Location:

trunk/examples/extended/analysis/A01

Files:

• A01app.cc (modified) (6 diffs)
• GNUmakefile (modified) (3 diffs)
• include/A01AnalysisManager.hh (modified) (1 diff)
• src/A01AnalysisManager.cc (modified) (3 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;
 }

trunk/examples/extended/analysis/A01/GNUmakefile

@@ -1 @@
-# $Id: GNUmakefile,v 1.10 2006/11/10 21:04:51 duns Exp $
+# $Id: GNUmakefile,v 1.11 2009/03/05 09:21:30 gbarrand Exp $
 # --------------------------------------------------------------
 # GNUmakefile for examples module
@@ -18 +18 @@
 # A01 uses its own physics lists. 
 #
-
-#OSC:begin
-# OpenScientist compilation and link flags :
-# Disconnect the usage of other GUIs :
-G4UI_USE_TERMINAL :=
-G4UI_USE_XM :=
-G4UI_USE_XAW :=
-G4UI_USE_QT :=
-G4UI_USE_WIN32 :=
-G4UI_USE_TCSH :=
-G4UI_USE_GAG :=
-G4UI_USE_OSC :=
-# Disconnect the usage of vis drivers that may interfer :
-G4VIS_USE_OPENGLX :=
-G4VIS_USE_OPENGLXM :=
-G4VIS_USE_OPENGLWIN32 :=
-G4VIS_USE_OIX :=
-G4VIS_USE_OIWIN32 :=
-G4VIS_USE_OPACS :=
-CPPFLAGS += `osc-config --g4lab_incs`
-INTYLIBS += $(shell osc-config --g4lab_libs)
-INTYLIBS += `osc-config --iv_libs`
-
-# Enable OpenScientist AIDA implementation :
-G4ANALYSIS_USE := 1
-G4ANALYSIS_AIDA_CONFIG_CFLAGS = `aida-config --include`
-G4ANALYSIS_AIDA_CONFIG_LIBS = `OnXLab_aida_config --libs`
-#G4ANALYSIS_AIDA_CONFIG_LIBS = `OnXLab_aida_config --libs`
-#OSC:end
 
 include $(G4INSTALL)/config/binmake.gmk
@@ -82 +53 @@
 endif
 
-ifdef G4ANALYSIS_USE
-   CPPFLAGS += `aida-config --include`
-   LDLIBS += `aida-config --lib`
-endif

trunk/examples/extended/analysis/A01/include/A01AnalysisManager.hh

@@ -65 +65 @@
 public:
 
-
-//OSC:begin
-public:
-  static AIDA::IAnalysisFactory* m_AIDA;
-  static void setAIDA(AIDA::IAnalysisFactory*);
-  static AIDA::IAnalysisFactory* getAIDA();
-public:
-//OSC:begin
-
   virtual ~A01AnalysisManager();
   static A01AnalysisManager* getInstance();

trunk/examples/extended/analysis/A01/src/A01AnalysisManager.cc

@@ -60 +60 @@
 #include "A01AnalysisManager.hh"
 
-//OSC:begin
-AIDA::IAnalysisFactory* A01AnalysisManager::m_AIDA = 0;
-void A01AnalysisManager::setAIDA(AIDA::IAnalysisFactory* a_AIDA) {m_AIDA = a_AIDA;}
-AIDA::IAnalysisFactory* A01AnalysisManager::getAIDA(){return m_AIDA;}
-//OSC:end
-
-
 A01AnalysisManager* A01AnalysisManager::instance = 0;
 
@@ -73 +66 @@
 {
   // Hooking an AIDA compliant analysis system.
-//OSC:begin
-  analysisFactory = getAIDA();
-//OSC:end
+  analysisFactory = AIDA_createAnalysisFactory();
   if(analysisFactory)
   {
@@ -101 +92 @@
     delete plotter;
     G4cout << "Warning: In case of working with JAS-AIDA, Geant4 will NOT exit unless you close the JAS-AIDA window." << G4endl;
-//OSC:begin
-// AIDA analysis factory is managed by
-// G4Lab::UIOnX, it can't be delete here.
-//    delete analysisFactory;
-//OSC:end
+    delete analysisFactory;
   }
 }