Changeset 54 for MEMPHYS

Timestamp:

Dec 6, 2005, 5:08:55 PM (19 years ago)

Author:

barrand

Message:

G.Barrand : have hit collection logic

File:

• MEMPHYS/HEAD/applications/MEMPHYS_session.cxx (modified) (4 diffs)

MEMPHYS/HEAD/applications/MEMPHYS_session.cxx

@@ -12 +12 @@
 
 // Lib :
-#include <Lib/Interfaces/ISession.h>
-#include <Lib/Manager.h>
+#include <Lib/Interfaces/IManager.h>
 #include <Lib/System.h>
-//#include <Lib/Debug.h>
+#include <Lib/Cast.h>
 
 // G4Lab :
 #include <G4Lab/UIOnX.h>
 #include <G4Lab/TrackingAction.h>
+#include <G4Lab/Helpers.h>
 
 //MEMPHYS:
@@ -43 +43 @@
   virtual void* cast(const std::string& aTo) const {
     if(aTo=="MEMPHYSAnalysisManager") {
-      return (MEMPHYSAnalysisManager*)this;
+      return Lib_SCast(MEMPHYSAnalysisManager);
     } else if(aTo=="MEMPHYSIAnalysis") {
-      return (MEMPHYSIAnalysis*)this;
+      return Lib_SCast(MEMPHYSIAnalysis);
     } else if(aTo=="MEMPHYSAnalysis") {
-      return (MEMPHYSAnalysis*)this;
+      return Lib_SCast(MEMPHYSAnalysis);
     } else if(aTo=="IManager") {
-      return (IManager*)this;
+      return Lib_SCast(IManager);
     } else {
       return 0;
@@ -77 +77 @@
   // Need to pass the G4RunManager at UIOnX creation
   std::string gui = "$MEMPHYSROOT/scripts/OnX/MEMPHYS_session.onx";
-  G4Lab::UIOnX* session = new G4Lab::UIOnX(runManager,gui,aArgc,aArgv);
+  G4Lab::UIOnX* session = new G4Lab::UIOnX(*runManager,gui,aArgc,aArgv);
 
   MEMPHYSAnalysisManager* analysisManager = 0;
 
-  // Declare actions that needs some UI or analysis facilities :
-  ISession* onxSession = session->session();
-  if(onxSession) {
-    // Get theg AIDA Lab implementation :
-    AIDA::IAnalysisFactory* aida = 
-      Lib_findManager(*onxSession,"AnalysisFactory",AIDA::IAnalysisFactory);
-    if(!aida) {
-      std::cout << "MEMPHYS_session :"
-                << " AnalysisFactory not found." << std::endl;
-    } else {
-      analysisManager = new MEMPHYSAnalysisManager(*aida,false);
-      onxSession->addManager(analysisManager);
-    }
+  AIDA::IAnalysisFactory* aida = G4Lab::UIOnX_aida(*session);
+  if(!aida) {
+    std::cout << "MEMPHYS_session : AIDA not found." << std::endl;
+  } else {
+    analysisManager = new MEMPHYSAnalysisManager(*aida,false);
+    session->addManager(analysisManager);
   }
 
@@ -113 +106 @@
 
   // Set user action classes
-  MEMPHYSPrimaryGeneratorAction* myGeneratorAction = new MEMPHYSPrimaryGeneratorAction(MEMPHYSdetector);
+  MEMPHYSPrimaryGeneratorAction* myGeneratorAction = 
+    new MEMPHYSPrimaryGeneratorAction(MEMPHYSdetector);
   runManager->SetUserAction(myGeneratorAction);