Universal action bundle implemented in fullSimLight and fsl

FullSimLight/fullSimLight.cc

@@ -283,13 +283,6 @@ int main(int argc, char** argv) {
         }
 
 
-	// Set extra user actions:
-        for (const auto& element : simConfig::jf["User Action Extensions"]){
-	  GeoPluginLoader<FSLUserActionPlugin> loader;
-	  const FSLUserActionPlugin * plugin = loader.load(element);
-	  //	  runManager->SetUserInitialization(plugin->getUserActionInitialization());
-	}
-	
         G4bool initialized=false;
         //parse and apply G4Commands
         for (G4String element : simConfig::jf["g4ui_commands"]){

FullSimLight/include/FSLActionInitialization.hh

@@ -31,7 +31,7 @@ private:
   G4String fSpecialScoringRegionName;
     
     
-    std::vector<std::string> userActions;
+  std::vector<std::string> userActions;
     
 
 

FullSimLight/src/FSLActionInitialization.cc

@@ -7,7 +7,7 @@
 #include "FSLSteppingAction.hh"
 #include "FSLTrackingAction.hh"
 #include "PythiaPrimaryGeneratorAction.hh"
-
+#include "FSLUserActionPlugin.h"
 #include "FSLUserRunActionPlugin.h"
 #include "FSLUserEventActionPlugin.h"
 #include "FSLUserStackingActionPlugin.h"
@@ -126,10 +126,16 @@ void FSLActionInitialization::Build() const {
     
   else if(fCustomUserActions)
   {
+    for (const std::string & element: userActions) {
+      GeoPluginLoader<FSLUserActionPlugin> loader;
+      const FSLUserActionPlugin * plugin = loader.load(element);
       
-      
-      
-      
+      if (plugin->getEventAction()) SetUserAction(plugin->getEventAction()); 
+      if (plugin->getRunAction()) SetUserAction(plugin->getRunAction()); 
+      if (plugin->getTrackingAction()) SetUserAction(plugin->getTrackingAction()); 
+      if (plugin->getStackingAction()) SetUserAction(plugin->getStackingAction()); 
+      if (plugin->getSteppingAction()) SetUserAction(plugin->getSteppingAction()); 
+
+    }
   }
-  
 }