From 9a5df1693de249f0335e4d608c7050d302507233 Mon Sep 17 00:00:00 2001
From: atlas <boudreau@pitt.edu>
Date: Mon, 27 Jun 2022 15:08:55 +0200
Subject: [PATCH] bugfix
---
FullSimLight/include/FSLConfigurator.hh | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/FullSimLight/include/FSLConfigurator.hh b/FullSimLight/include/FSLConfigurator.hh
index 150f673b5..f5fcae1ce 100644
--- a/FullSimLight/include/FSLConfigurator.hh
+++ b/FullSimLight/include/FSLConfigurator.hh
@@ -61,11 +61,6 @@ struct fslConfig{
std::string magFieldMap;
std::string magFieldPlugin;
- std::vector<std::string> runActions;
- std::vector<std::string> eventActions;
- std::vector<std::string> steppingActions;
- std::vector<std::string> stackingActions;
- std::vector<std::string> trackingActions;
std::vector<std::string> userActions;
@@ -77,7 +72,7 @@ regionConfig rc;
json jf;
inline void to_json(json& j, const fslConfig& p) {
- j = json{{"Geometry", p.geometry},{"Physics list name", p.physicsList},{"Number of events", p.nEvents},{"Magnetic Field Intensity", p.magFieldIntensity},{"Generator", p.eventGeneratorName},{"Event input file", p.eventInputFile},{"Type of event", p.typeOfEvent},{"Sensitive Detector Extensions", p.sensitiveDetectors},{"Output Hits file", p.outputHitsFile},{"Output Histo file", p.outputHistoFile},{"Magnetic Field Type", p.magFieldType},{"Magnetic Field Map", p.magFieldMap},{"Magnetic Field Plugin", p.magFieldPlugin},{"Run Actions", p.runActions},{"Event Actions", p.eventActions},{"Stepping Actions", p.steppingActions},{"Stacking Actions", p.stackingActions},{"Tracking Actions", p.trackingActions},{"User Action Extensions", p.userActions},{"g4ui_commands", p.g4UiCommands}};
+ j = json{{"Geometry", p.geometry},{"Physics list name", p.physicsList},{"Number of events", p.nEvents},{"Magnetic Field Intensity", p.magFieldIntensity},{"Generator", p.eventGeneratorName},{"Event input file", p.eventInputFile},{"Type of event", p.typeOfEvent},{"Sensitive Detector Extensions", p.sensitiveDetectors},{"Output Hits file", p.outputHitsFile},{"Output Histo file", p.outputHistoFile},{"Magnetic Field Type", p.magFieldType},{"Magnetic Field Map", p.magFieldMap},{"Magnetic Field Plugin", p.magFieldPlugin},{"User Action Extensions", p.userActions},{"g4ui_commands", p.g4UiCommands}};
}
inline void to_json(json& j, const regionConfig& r) {
@@ -97,11 +92,6 @@ inline void from_json(const json& j, fslConfig& p) {
p.outputHistoFile=j.at("Output Histo file").get<std::string>();
p.magFieldMap=j.at("Magnetic Field Map").get<std::string>();
p.magFieldPlugin=j.at("Magnetic Field Plugin").get<std::string>();
- p.runActions=j.at("Run Actions").get<std::vector<std::string>>();
- p.eventActions=j.at("Event Actions").get<std::vector<std::string>>();
- p.steppingActions=j.at("Stepping Actions").get<std::vector<std::string>>();
- p.stackingActions=j.at("Stacking Actions").get<std::vector<std::string>>();
- p.trackingActions=j.at("Tracking Actions").get<std::vector<std::string>>();
p.userActions=j.at("User Action Extensions").get<std::vector<std::string>>();
p.g4UiCommands=j.at("g4ui_commands").get<std::vector<std::string>>();
--
GitLab