added maxStep to readout specs, setting it in detector construction. fix random number seed. setting maxStep in the dynamic digitizations. fix gparticle log

Author: maureeungaro

actions/event/gEventAction.cc

@@ -97,6 +97,7 @@ void GEventAction::EndOfEventAction([[maybe_unused]] const G4Event* event) {
 		// Process all hits in the collection. Event-mode digitizers append to the
 		// event container, while run-mode digitizers append to the run container.
 		for (size_t hitIndex = 0; hitIndex < this_ghc->GetSize(); ++hitIndex) {
+
 			auto* const this_hit = static_cast<GHit*>(this_ghc->GetHit(hitIndex));
 			if (this_hit == nullptr) {
 				continue;

actions/event/gEventAction.h

@@ -8,32 +8,32 @@
 #include "../run/gRunAction.h"
 
 /**
- * @file gEventAction.h
- * @brief Declares GEventAction, the per-event processing action for the GEMC actions module.
+ * \file gEventAction.h
+ * \brief Declares GEventAction, the per-event processing action for the GEMC actions module.
  *
  * @ingroup gactions_module
  */
 
 constexpr const char* EVENTACTION_LOGGER = "geventaction";
 
 /**
- * @brief Namespace containing helpers related to event-action configuration.
+ * \brief Namespace containing helpers related to event-action configuration.
  *
  * @ingroup gactions_module
  */
 namespace geventaction {
 	/**
-	 * @brief Returns the options associated with the event-action logger scope.
+	 * \brief Returns the options associated with the event-action logger scope.
 	 *
-	 * @return A GOptions object scoped to the event-action logger name.
+	 * \return A GOptions object scoped to the event-action logger name.
 	 */
 	inline GOptions defineOptions() { return GOptions(EVENTACTION_LOGGER); }
 } // namespace geventaction
 
 
 /**
  * @class GEventAction
- * @brief Handles event begin/end callbacks, hit digitization, and event-level publication.
+ * \brief Handles event begin/end callbacks, hit digitization, and event-level publication.
  *
  * This class is the worker-side event action used by GEMC. It participates in the
  * per-event lifecycle driven by Geant4 and is responsible for transforming hit
@@ -59,10 +59,10 @@ class GEventAction : public GBase<GEventAction>, public G4UserEventAction
 {
 public:
 	/**
-	 * @brief Constructs the event action.
+	 * \brief Constructs the event action.
 	 *
-	 * @param gopt Shared configuration object used for event-product construction and logging.
-	 * @param run_a Non-owning pointer to the thread-local GRunAction instance that provides
+	 * \param gopt Shared configuration object used for event-product construction and logging.
+	 * \param run_a Non-owning pointer to the thread-local GRunAction instance that provides
 	 *              access to digitization routines, run-level accumulation, and streamers.
 	 */
 	explicit GEventAction(const std::shared_ptr<GOptions>& gopt, GRunAction* run_a);
@@ -75,17 +75,17 @@ class GEventAction : public GBase<GEventAction>, public G4UserEventAction
 	GEventAction& operator=(GEventAction&&)      = delete;
 
 	/**
-	 * @brief Called by Geant4 at the beginning of an event.
+	 * \brief Called by Geant4 at the beginning of an event.
 	 *
 	 * In this implementation, the method is mainly used for event/thread tracing and
 	 * lightweight diagnostics.
 	 *
-	 * @param event Geant4 event descriptor for the event being started.
+	 * \param event Geant4 event descriptor for the event being started.
 	 */
 	void BeginOfEventAction(const G4Event* event) override;
 
 	/**
-	 * @brief Called by Geant4 at the end of an event.
+	 * \brief Called by Geant4 at the end of an event.
 	 *
 	 * This method performs the main event-processing logic of the module:
 	 * - count the event in the run-level bookkeeping;
@@ -96,25 +96,25 @@ class GEventAction : public GBase<GEventAction>, public G4UserEventAction
 	 *   the digitizer collection mode;
 	 * - publish the event data once all event-mode collections have been processed.
 	 *
-	 * @param event Geant4 event descriptor for the event being completed.
+	 * \param event Geant4 event descriptor for the event being completed.
 	 */
 	void EndOfEventAction(const G4Event* event) override;
 
 private:
 	/**
-	 * @brief Publishes a completed event data collection to all worker-thread streamers.
+	 * \brief Publishes a completed event data collection to all worker-thread streamers.
 	 *
-	 * @param event_data Shared event-data object containing the completed event payload.
+	 * \param event_data Shared event-data object containing the completed event payload.
 	 */
 	void publish_event_data(const std::shared_ptr<GEventDataCollection>& event_data) const;
 
 	/**
-	 * @brief Shared configuration used to build event products and control logging.
+	 * \brief Shared configuration used to build event products and control logging.
 	 */
 	std::shared_ptr<GOptions> goptions;
 
 	/**
-	 * @brief Non-owning pointer to the thread-local run action associated with this event action.
+	 * \brief Non-owning pointer to the thread-local run action associated with this event action.
 	 *
 	 * The run action provides:
 	 * - access to the shared digitization-routine map;

actions/gaction.cc

@@ -6,11 +6,15 @@
 
 // Construct the action initializer and keep shared services available for later
 // action registration on worker and master execution contexts.
-GAction::GAction(std::shared_ptr<GOptions> gopts,
+GAction::GAction(std::shared_ptr<GOptions>                           gopts,
 				 std::shared_ptr<gdynamicdigitization::dRoutinesMap> digi_map) :
 	GBase(gopts, GACTION_LOGGER),
 	goptions(std::move(gopts)),
-	digitization_routines_map(std::move(digi_map)) { }
+	digitization_routines_map(std::move(digi_map)) {
+
+	log->debug(CONSTRUCTOR, FUNCTION_NAME);
+
+}
 
 
 // Register the master-thread actions.
@@ -40,4 +44,4 @@ void GAction::Build() const {
 
 	// The event action consumes the run action as a non-owning dependency.
 	SetUserAction(new GEventAction(goptions, run_action));
-}
+}

actions/gaction.h

@@ -15,8 +15,8 @@
 #include "generator/gPrimaryGeneratorAction.h"
 
 /**
- * @file gaction.h
- * @brief Declares GAction, the Geant4 action-initialization entry point for the GEMC actions module.
+ * \file gaction.h
+ * \brief Declares GAction, the Geant4 action-initialization entry point for the GEMC actions module.
  *
  * GAction is the module-level class responsible for registering the Geant4 user
  * actions used by GEMC. It derives from \c G4VUserActionInitialization and is
@@ -29,7 +29,7 @@
 constexpr const char* GACTION_LOGGER = "gaction";
 
 /**
- * @brief Namespace containing helpers related to action-subsystem configuration.
+ * \brief Namespace containing helpers related to action-subsystem configuration.
  *
  * The functions in this namespace are intended to support module setup by providing
  * a single place where all action-related option definitions can be collected.
@@ -39,7 +39,7 @@ constexpr const char* GACTION_LOGGER = "gaction";
 namespace gaction {
 
 /**
- * @brief Builds the aggregate option set required by the actions subsystem.
+ * \brief Builds the aggregate option set required by the actions subsystem.
  *
  * This helper creates a logger-scoped GOptions object for the action module and
  * then merges into it the option definitions contributed by the event action,
@@ -48,7 +48,7 @@ namespace gaction {
  * The returned object is meant to be merged into the wider application configuration
  * before constructing GAction.
  *
- * @return A GOptions object containing the union of all action-related option definitions.
+ * \return A GOptions object containing the union of all action-related option definitions.
  */
 inline GOptions defineOptions() {
 	auto goptions = GOptions(GACTION_LOGGER);
@@ -64,7 +64,7 @@ inline GOptions defineOptions() {
 
 /**
  * @class GAction
- * @brief Registers GEMC user actions for worker threads, sequential execution, and the master thread.
+ * \brief Registers GEMC user actions for worker threads, sequential execution, and the master thread.
  *
  * Geant4 uses an action-initialization object derived from \c G4VUserActionInitialization
  * to obtain the user actions that will participate in a simulation.
@@ -93,10 +93,10 @@ inline GOptions defineOptions() {
 class GAction : public GBase<GAction>, public G4VUserActionInitialization {
 public:
 	/**
-	 * @brief Constructs the action initializer used by the Geant4 run manager.
+	 * \brief Constructs the action initializer used by the Geant4 run manager.
 	 *
-	 * @param gopts Shared configuration object used by all actions constructed by this initializer.
-	 * @param digi_map Shared map associating collection names with digitization routines.
+	 * \param gopts Shared configuration object used by all actions constructed by this initializer.
+	 * \param digi_map Shared map associating collection names with digitization routines.
 	 */
 	explicit GAction(std::shared_ptr<GOptions> gopts,
 	                 std::shared_ptr<gdynamicdigitization::dRoutinesMap> digi_map);
@@ -109,7 +109,7 @@ class GAction : public GBase<GAction>, public G4VUserActionInitialization {
 	GAction& operator=(GAction&&)      = delete;
 
 	/**
-	 * @brief Registers the user actions required by worker threads and sequential execution.
+	 * \brief Registers the user actions required by worker threads and sequential execution.
 	 *
 	 * This method is called by Geant4 when action objects must be created for an
 	 * execution context that processes events.
@@ -126,7 +126,7 @@ class GAction : public GBase<GAction>, public G4VUserActionInitialization {
 	void Build() const override;
 
 	/**
-	 * @brief Registers the user actions required by the master thread.
+	 * \brief Registers the user actions required by the master thread.
 	 *
 	 * In multithreaded execution, the master thread does not process individual events.
 	 * For that reason, only GRunAction is registered here. That action handles the
@@ -136,7 +136,7 @@ class GAction : public GBase<GAction>, public G4VUserActionInitialization {
 
 private:
 	/**
-	 * @brief Shared configuration used when constructing all action objects.
+	 * \brief Shared configuration used when constructing all action objects.
 	 *
 	 * This pointer is stored so both \ref GAction::Build "Build()" and
 	 * \ref GAction::BuildForMaster "BuildForMaster()" create actions using the same
@@ -145,7 +145,7 @@ class GAction : public GBase<GAction>, public G4VUserActionInitialization {
 	std::shared_ptr<GOptions> goptions;
 
 	/**
-	 * @brief Shared digitization-routine map passed to run and event processing actions.
+	 * \brief Shared digitization-routine map passed to run and event processing actions.
 	 *
 	 * The map associates collection names with the routines that know how to transform
 	 * raw hit information into GEMC digitized and truth-level payload.

actions/gactionConventions.h

@@ -1,12 +1,12 @@
 /**
-* @file gactionConventions.h
- * @brief Defines error codes used by the GEMC actions module.
+* \file gactionConventions.h
+ * \brief Defines error codes used by the GEMC actions module.
  *
  * This header centralizes stable error identifiers used by the action-related
  * classes when reporting failures through the logging system.
  *
  * @defgroup gactions_module_errors GEMC actions module error codes
- * @brief Error/status codes used by the GEMC actions module.
+ * \brief Error/status codes used by the GEMC actions module.
  *
  * These numeric codes make it easier to identify recurring failure modes in logs,
  * tests, and operational diagnostics.
@@ -17,7 +17,7 @@
 /**
  * @ingroup gactions_module_errors
  * @name Error codes
- * @brief Module-level error/status codes emitted by action-related classes.
+ * \brief Module-level error/status codes emitted by action-related classes.
  *
  * The values are in the 1200 range and are intended to remain stable so log-based
  * diagnostics can reliably identify the same category of problem across builds.

actions/gactionsDoxy.h

@@ -1,14 +1,14 @@
 /**
- * @file gactionsDoxy.h
- * @brief Doxygen entry point for the GEMC actions module.
+ * \file gactionsDoxy.h
+ * \brief Doxygen entry point for the GEMC actions module.
  *
  * This file defines the module-level Doxygen group and the main documentation page
  * for the action subsystem responsible for Geant4 action registration and execution.
  */
 
 /**
  * @defgroup gactions_module GEMC actions module
- * @brief Geant4 action initialization and per-thread action components for GEMC.
+ * \brief Geant4 action initialization and per-thread action components for GEMC.
  *
  * This module contains the classes that register and execute the Geant4 user actions
  * used by GEMC during a run. It centralizes the action lifecycle, threading model,

actions/generator/gPrimaryGeneratorAction.cc

@@ -25,7 +25,6 @@ GPrimaryGeneratorAction::GPrimaryGeneratorAction(std::shared_ptr<GOptions> gopts
 // inject the corresponding primary information into the current event.
 void GPrimaryGeneratorAction::GeneratePrimaries(G4Event* anEvent) {
 	for (const auto& gparticle : gparticles) {
-		log->info(2, gparticle);
 
 		if (gparticle != nullptr) {
 			gparticle->shootParticle(gparticleGun.get(), anEvent);

actions/generator/gPrimaryGeneratorAction.h

@@ -13,30 +13,30 @@
 #include "G4ParticleGun.hh"
 
 /**
- * @file gPrimaryGeneratorAction.h
- * @brief Declares GPrimaryGeneratorAction, the primary-particle generation action for the GEMC actions module.
+ * \file gPrimaryGeneratorAction.h
+ * \brief Declares GPrimaryGeneratorAction, the primary-particle generation action for the GEMC actions module.
  *
  * @ingroup gactions_module
  */
 
 constexpr const char* GPRIMARYGENERATORACTION_LOGGER = "generator";
 
 /**
- * @brief Namespace containing helpers related to primary-generator configuration.
+ * \brief Namespace containing helpers related to primary-generator configuration.
  *
  * @ingroup gactions_module
  */
 namespace gprimaryaction {
 
 /**
- * @brief Returns the options associated with the primary-generator action scope.
+ * \brief Returns the options associated with the primary-generator action scope.
  *
  * In the current implementation this helper returns a logger-scoped GOptions object
  * without adding dedicated primary-generator switches directly in this file.
  * Generator behavior is instead mainly driven by the particle definitions loaded
  * through the generator support code.
  *
- * @return A GOptions object scoped to the primary-generator logger name.
+ * \return A GOptions object scoped to the primary-generator logger name.
  */
 inline GOptions defineOptions() {
 	return GOptions(GPRIMARYGENERATORACTION_LOGGER);
@@ -47,7 +47,7 @@ inline GOptions defineOptions() {
 
 /**
  * @class GPrimaryGeneratorAction
- * @brief Generates the primary vertices for each Geant4 event.
+ * \brief Generates the primary vertices for each Geant4 event.
  *
  * This class is the GEMC implementation of the Geant4 primary-generator action.
  * It owns a \c G4ParticleGun and a list of configured Gparticle objects.
@@ -65,14 +65,14 @@ inline GOptions defineOptions() {
 class GPrimaryGeneratorAction : public GBase<GPrimaryGeneratorAction>, public G4VUserPrimaryGeneratorAction {
 public:
 	/**
-	 * @brief Constructs the primary-generator action.
+	 * \brief Constructs the primary-generator action.
 	 *
 	 * Construction performs the following steps:
 	 * - allocate the \c G4ParticleGun instance used for emission;
 	 * - read the configured particle definitions through gparticle support helpers;
 	 * - create a default particle if no explicit particle definition is available.
 	 *
-	 * @param gopts Shared configuration object used to retrieve generator settings and logging controls.
+	 * \param gopts Shared configuration object used to retrieve generator settings and logging controls.
 	 */
 	explicit GPrimaryGeneratorAction(std::shared_ptr<GOptions> gopts);
 
@@ -84,7 +84,7 @@ class GPrimaryGeneratorAction : public GBase<GPrimaryGeneratorAction>, public G4
 	GPrimaryGeneratorAction& operator=(GPrimaryGeneratorAction&&)      = delete;
 
 	/**
-	 * @brief Generates the primary content for one event.
+	 * \brief Generates the primary content for one event.
 	 *
 	 * The method loops over all configured Gparticle objects. For each non-null entry,
 	 * it asks the particle object to configure the internal \c G4ParticleGun and to
@@ -93,21 +93,21 @@ class GPrimaryGeneratorAction : public GBase<GPrimaryGeneratorAction>, public G4
 	 * This design allows multiple configured particle definitions to contribute to a
 	 * single Geant4 event.
 	 *
-	 * @param event The event that will receive the generated primary vertices and particles.
+	 * \param event The event that will receive the generated primary vertices and particles.
 	 */
 	void GeneratePrimaries(G4Event* event) override;
 
 private:
 	/**
-	 * @brief Particle-gun instance used to materialize configured primaries into the event.
+	 * \brief Particle-gun instance used to materialize configured primaries into the event.
 	 *
 	 * The gun is owned exclusively by this class and reused across events. Individual
 	 * Gparticle objects configure it before shooting their contribution to the event.
 	 */
 	std::unique_ptr<G4ParticleGun> gparticleGun;
 
 	/**
-	 * @brief List of configured particle definitions used during event generation.
+	 * \brief List of configured particle definitions used during event generation.
 	 *
 	 * Each entry represents one generator-side particle description. During event
 	 * generation the list is traversed in order, and each non-null entry is given