event & generator actions - just run action then I can test

CMakeLists.txt

@@ -22,6 +22,8 @@ hk_add_tool(HKG4TrackingAction)
 hk_add_tool(HKG4StackingAction)
 hk_add_tool(HKG4PhysicsList)
 hk_add_tool(HKG4SteppingAction)
+hk_add_tool(HKG4PrimaryGeneratorAction)
+hk_add_tool(HKG4EventAction)
 
 option(WCSIM_Check_Geometry_Overlaps
   "Toggle WCSim to save photon scattering and reflection history"

HKG4EventAction/HKG4EventAction.cpp

@@ -0,0 +1,44 @@
+#include "HKG4EventAction.h"
+
+#include "WCSimEventAction.hh"
+#include "WCSimPrimaryGeneratorAction.hh"
+#include "WCSimDetectorConstruction.hh"
+#include "WCSimRunAction.hh"
+
+using namespace	HK::Ghost::G4;
+
+HKG4EventAction::HKG4EventAction() : Tool() {}
+
+bool HKG4EventAction::Initialise(std::string configfile, DataModel& data) {
+
+	if(configfile != "")
+		m_variables.Initialise(configfile);
+	// m_variables.Print();
+
+	m_data = &data;
+	m_log  = m_data->Log;
+
+	if(!m_variables.Get("verbose", m_verbose))
+		m_verbose = 1;
+
+	const WCSimRunAction* cp_run =
+		static_cast<const WCSimRunAction*>(m_data->m_p_run_manager->GetUserRunAction());
+	const WCSimDetectorConstruction* cp_det =
+		static_cast<const WCSimDetectorConstruction*>(m_data->m_p_run_manager->GetUserDetectorConstruction());
+	const WCSimPrimaryGeneratorAction* cp_gen =
+		static_cast<const WCSimPrimaryGeneratorAction*>(m_data->m_p_run_manager->GetUserPrimaryGeneratorAction());
+
+	m_data->m_p_run_manager->SetUserAction(new WCSimEventAction(cp_run, cp_det, cp_gen));
+
+	return true;
+}
+
+bool HKG4EventAction::Execute() {
+
+	return true;
+}
+
+bool HKG4EventAction::Finalise() {
+
+	return true;
+}

HKG4EventAction/HKG4EventAction.h

@@ -0,0 +1,42 @@
+#ifndef HKG4EventAction_H
+#define HKG4EventAction_H
+
+#include <iostream>
+#include <string>
+
+#include <DataModel.h>
+#include "Tool.h"
+
+/**
+ * \class HKG4EventAction
+ *
+ * This is a blank template for a Tool used by the script to generate a new custom tool. Please fill out the
+ * description and author information.
+ *
+ * $Author: B.Richards $
+ * $Date: 2019/05/28 10:44:00 $
+ */
+
+namespace HK {
+	namespace Ghost {
+		namespace G4 {
+			class HKG4EventAction : public Tool {
+
+			public:
+
+				HKG4EventAction();  ///< Simple constructor
+				bool Initialise(std::string configfile,
+												DataModel& data);  ///< Initialise Function for setting up Tool resources. @param
+				///< configfile The path and name of the dynamic configuration file
+				///< to read in. @param data A reference to the transient data
+				///< class used to pass information between Tools.
+				bool Execute();                    ///< Execute function used to perform Tool purpose.
+				bool Finalise();                   ///< Finalise funciton used to clean up resources.
+
+			private:
+			};
+		} // namespace G4
+	} // namespace Ghost
+} // namespace HK
+
+#endif

HKG4EventAction/README.md

@@ -0,0 +1 @@
+# HKG4EventAction

HKG4PrimaryGeneratorAction/HKG4PrimaryGeneratorAction.cpp

@@ -0,0 +1,34 @@
+#include "HKG4PrimaryGeneratorAction.h"
+
+#include "WCSimPrimaryGeneratorAction.hh"
+
+using namespace	HK::Ghost::G4;
+
+HKG4PrimaryGeneratorAction::HKG4PrimaryGeneratorAction() : Tool() {}
+
+bool HKG4PrimaryGeneratorAction::Initialise(std::string configfile, DataModel& data) {
+
+	if(configfile != "")
+		m_variables.Initialise(configfile);
+	// m_variables.Print();
+
+	m_data = &data;
+	m_log  = m_data->Log;
+
+	if(!m_variables.Get("verbose", m_verbose))
+		m_verbose = 1;
+
+	m_data->m_p_run_manager->SetUserAction(new WCSimPrimaryGeneratorAction(static_cast<const WCSimDetectorConstruction*>(m_data->m_p_run_manager->GetUserDetectorConstruction())));
+
+	return true;
+}
+
+bool HKG4PrimaryGeneratorAction::Execute() {
+
+	return true;
+}
+
+bool HKG4PrimaryGeneratorAction::Finalise() {
+
+	return true;
+}

HKG4PrimaryGeneratorAction/HKG4PrimaryGeneratorAction.h

@@ -0,0 +1,42 @@
+#ifndef HKG4PrimaryGeneratorAction_H
+#define HKG4PrimaryGeneratorAction_H
+
+#include <iostream>
+#include <string>
+
+#include <DataModel.h>
+#include "Tool.h"
+
+/**
+ * \class HKG4PrimaryGeneratorAction
+ *
+ * This is a blank template for a Tool used by the script to generate a new custom tool. Please fill out the
+ * description and author information.
+ *
+ * $Author: B.Richards $
+ * $Date: 2019/05/28 10:44:00 $
+ */
+
+namespace HK {
+	namespace Ghost {
+		namespace G4 {
+			class HKG4PrimaryGeneratorAction : public Tool {
+
+			public:
+
+				HKG4PrimaryGeneratorAction();  ///< Simple constructor
+				bool Initialise(std::string configfile,
+												DataModel& data);  ///< Initialise Function for setting up Tool resources. @param
+				///< configfile The path and name of the dynamic configuration file
+				///< to read in. @param data A reference to the transient data
+				///< class used to pass information between Tools.
+				bool Execute();                    ///< Execute function used to perform Tool purpose.
+				bool Finalise();                   ///< Finalise funciton used to clean up resources.
+
+			private:
+			};
+		} // namespace G4
+	} // namespace Ghost
+} // namespace HK
+
+#endif

HKG4PrimaryGeneratorAction/README.md

@@ -0,0 +1 @@
+# HKG4PrimaryGeneratorAction

WCSim_exe/WCSim_exe.cpp

@@ -79,8 +79,8 @@ bool WCSim_exe::Initialise(std::string configfile, DataModel& data) {
 	m_data->m_p_run_manager->SetUserInitialization(WCSimdetector);
 
 	// Set user action classes
-	WCSimPrimaryGeneratorAction* myGeneratorAction = new WCSimPrimaryGeneratorAction(WCSimdetector);
-	m_data->m_p_run_manager->SetUserAction(myGeneratorAction);
+	//WCSimPrimaryGeneratorAction* myGeneratorAction = new WCSimPrimaryGeneratorAction(WCSimdetector);
+	//m_data->m_p_run_manager->SetUserAction(myGeneratorAction);
 
 	WCSimRunAction* myRunAction = new WCSimRunAction(WCSimdetector, randomparameters);
 
@@ -91,7 +91,7 @@ bool WCSim_exe::Initialise(std::string configfile, DataModel& data) {
 
 	m_data->m_p_run_manager->SetUserAction(myRunAction);
 
-	m_data->m_p_run_manager->SetUserAction(new WCSimEventAction(myRunAction, WCSimdetector, myGeneratorAction));
+	//m_data->m_p_run_manager->SetUserAction(new WCSimEventAction(myRunAction, WCSimdetector, myGeneratorAction));
 	//m_data->m_p_run_manager->SetUserAction(new WCSimTrackingAction);
 
 	//m_data->m_p_run_manager->SetUserAction(new WCSimStackingAction(WCSimdetector));