From ef224ce8d4e01ba33fbf52c2e8cfba9b52f57372 Mon Sep 17 00:00:00 2001
From: Raees Khan <rak177@pitt.edu>
Date: Tue, 21 Jun 2022 11:08:44 -0400
Subject: [PATCH] User actions
---
FSL/src/fsl_mainwindow.cpp | 2 +-
FullSimLight/fullSimLight.cc | 10 +++++-----
FullSimLight/src/FSLActionInitialization.cc | 17 ++++++++++++-----
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/FSL/src/fsl_mainwindow.cpp b/FSL/src/fsl_mainwindow.cpp
index 506601d10..c45b8f522 100644
--- a/FSL/src/fsl_mainwindow.cpp
+++ b/FSL/src/fsl_mainwindow.cpp
@@ -139,7 +139,7 @@ FSLMainWindow::FSLMainWindow(QWidget *parent)
ui->tab->setEnabled(false);//Shape tab (Change name on UI)
ui->Region->setEnabled(false);
- ui->User_Actions->setEnabled(false);
+ // ui->User_Actions->setEnabled(false);
diff --git a/FullSimLight/fullSimLight.cc b/FullSimLight/fullSimLight.cc
index d014d2540..23b9930ff 100644
--- a/FullSimLight/fullSimLight.cc
+++ b/FullSimLight/fullSimLight.cc
@@ -210,11 +210,11 @@ int main(int argc, char** argv) {
// 3. User action
FSLActionInitialization* actInit = new FSLActionInitialization(parIsPerformance);
actInit->SetActions(
- simConfig::jf["Event Actions"],
- simConfig::jf["Run Actions"],
- simConfig::jf["Tracking Actions"],
- simConfig::jf["Stepping Actions"],
- simConfig::jf["Stacking Actions"]
+ simConfig::fsl.eventActions,
+ simConfig::fsl.runActions,
+ simConfig::fsl.trackingActions,
+ simConfig::fsl.steppingActions,
+ simConfig::fsl.stackingActions
);
// set the name of a region in which we are interested to see a very basic simulation
diff --git a/FullSimLight/src/FSLActionInitialization.cc b/FullSimLight/src/FSLActionInitialization.cc
index 84a51686f..8028853d2 100644
--- a/FullSimLight/src/FSLActionInitialization.cc
+++ b/FullSimLight/src/FSLActionInitialization.cc
@@ -8,6 +8,13 @@
#include "FSLTrackingAction.hh"
#include "PythiaPrimaryGeneratorAction.hh"
+#include "FSLUserRunActionPlugin.h"
+#include "FSLUserEventActionPlugin.h"
+#include "FSLUserStackingActionPlugin.h"
+#include "FSLUserTrackingActionPlugin.h"
+#include "FSLUserSteppingActionPlugin.h"
+
+
#include "G4Version.hh"
#if G4VERSION_NUMBER>=1040
#include "G4MultiRunAction.hh"
@@ -123,7 +130,7 @@ void FSLActionInitialization::Build() const {
{
GeoPluginLoader<FSLUserRunActionPlugin> loader;
const FSLUserRunActionPlugin * plugin = loader.load(element);
- G4UserRunAction* runAct = plugin->getRunAction();
+ G4UserRunAction* runAct = plugin->getUserRunAction();
SetUserAction(runAct);
}
@@ -132,7 +139,7 @@ void FSLActionInitialization::Build() const {
{
GeoPluginLoader<FSLUserEventActionPlugin> loader;
const FSLUserEventActionPlugin * plugin = loader.load(element);
- G4UserEventAction* evtAct = plugin->getEventAction();
+ G4UserEventAction* evtAct = plugin->getUserEventAction();
SetUserAction(evtAct);
}
@@ -141,7 +148,7 @@ void FSLActionInitialization::Build() const {
{
GeoPluginLoader<FSLUserSteppingActionPlugin> loader;
const FSLUserSteppingActionPlugin * plugin = loader.load(element);
- G4UserSteppingAction* steAct = plugin->getSteppingAction();
+ G4UserSteppingAction* steAct = plugin->getUserSteppingAction();
SetUserAction(steAct);
}
@@ -151,7 +158,7 @@ void FSLActionInitialization::Build() const {
{
GeoPluginLoader<FSLUserTrackingActionPlugin> loader;
const FSLUserTrackingActionPlugin * plugin = loader.load(element);
- G4UserTrackingAction* traAct = plugin->getTrackingAction();
+ G4UserTrackingAction* traAct = plugin->getUserTrackingAction();
SetUserAction(traAct);
}
@@ -160,7 +167,7 @@ void FSLActionInitialization::Build() const {
{
GeoPluginLoader<FSLUserStackingActionPlugin> loader;
const FSLUserStackingActionPlugin * plugin = loader.load(element);
- G4UserStackingAction* staAct = plugin->getStackingAction();
+ G4UserStackingAction* staAct = plugin->getUserStackingAction();
SetUserAction(staAct);
}
--
GitLab