Changeset 893 for trunk/examples/extended

Timestamp:

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

Author:

garnier

Message:

make 3.80 added because 3.81 is bad

Location:

trunk/examples/extended/analysis/A01

Files:

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

trunk/examples/extended/analysis/A01/GNUmakefile

@@ -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

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;
 
@@ -66 +73 @@
 {
   // Hooking an AIDA compliant analysis system.
-  analysisFactory = AIDA_createAnalysisFactory();
+//OSC:begin
+  analysisFactory = getAIDA();
+//OSC:end
   if(analysisFactory)
   {
@@ -92 +101 @@
     delete plotter;
     G4cout << "Warning: In case of working with JAS-AIDA, Geant4 will NOT exit unless you close the JAS-AIDA window." << G4endl;
-    delete analysisFactory;
+//OSC:begin
+// AIDA analysis factory is managed by
+// G4Lab::UIOnX, it can't be delete here.
+//    delete analysisFactory;
+//OSC:end
   }
 }