Changeset 354 for MEMPHYS

Timestamp:

Jun 1, 2007, 8:37:34 PM (17 years ago)

Author:

barrand

Message:

 

File:

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

MEMPHYS/HEAD/applications/MEMPHYS_session.cxx

@@ -22 +22 @@
 #include <Lib/Out.h>
 #include <Lib/Cast.h>
+#include <Lib/Arguments.h>
 
 // G4Lab :
@@ -94 +95 @@
             accessorManager->removeAccessor(hcName);
             accessorManager->addAccessor
-              (new MEMPHYS::HitsCollectionAccessor(fSession,hcName));
+              (new MEMPHYS::HitsCollectionAccessor
+                (fSession,g4Manager->runManager(),hcName));
           }
         }
@@ -106 +108 @@
       accessorManager->addAccessor
         (new MEMPHYS::DigitsCollectionAccessor<MEMPHYS::WCDigi>
-          (fSession,"WCDigitizedCollection"));
+          (fSession,g4Manager->runManager(),"WCDigitizedCollection"));
     }
     return true;
   }
  public:
-  AppManager(Slash::Core::ISession& aSession,AIDA::IAnalysisFactory* aAIDA,bool aBatch)
+  AppManager(Slash::Core::ISession& aSession,
+             AIDA::IAnalysisFactory* aAIDA,bool aBatch)
     :Analysis(aAIDA,"",aBatch)
     ,fSession(aSession)
@@ -132 +135 @@
   //Lib::Debug::checkByClass(true);
 
+  Lib::Arguments args(aArgc,aArgv);
+
   G4RunManager* runManager = new G4RunManager;
 
@@ -143 +148 @@
   runManager->SetGeometryToBeOptimized(false);
 
+  std::string gui;
+  if(args.isAnArgument("-SDL")||args.isAnArgument("-sdl")) {
+    gui = "$MEMPHYSROOT/scripts/OnX/SDL.onx";
+  } else {
+    gui = "$MEMPHYSROOT/scripts/OnX/MEMPHYS_session.onx";
+  }
+ 
   // 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);
   if(!session->isValid()) {