removed hitbit set, storing all vars

Author: maureeungaro

gemc/gdynamicDigitization/examples/gplugin_test_example.cc

@@ -5,12 +5,11 @@
 // - This .cc file contains implementation-only comments to avoid duplicated \param sections.
 
 bool GPlugin_test_example::defineReadoutSpecsImpl() {
-	double timeWindow    = 10;                  // electronics time-window (width of one time cell)
-	double gridStartTime = 0;                   // time grid origin
-	auto   hitBitSet     = HitBitSet("100000"); // bitset defining which hit information is computed/stored
+	double timeWindow    = 10;   // electronics time-window (width of one time cell)
+	double gridStartTime = 0;   // time grid origin
 	double maxStep       = 1 * CLHEP::mm;
 
-	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, hitBitSet, maxStep, log);
+	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, maxStep, log);
 
 	return true;
 }

gemc/gdynamicDigitization/gDosimeterDigitization.cc

@@ -15,13 +15,12 @@
 bool GDosimeterDigitization::defineReadoutSpecsImpl() {
 	// Time window is the width of one electronics time cell (unit follows the convention
 	// used by the rest of the digitization chain; typically ns).
-	double timeWindow    = 10;                  // electronic readout time-window of the detector
-	double gridStartTime = 0;                   // defines the windows grid
-	auto   hitBitSet     = HitBitSet("000001"); // defines what information to be stored in the hit
+	double timeWindow    = 10;   // electronic readout time-window of the detector
+	double gridStartTime = 0;   // defines the windows grid
 	double maxStep       = 1 * CLHEP::mm;
 
 	// Readout specs are immutable after initialization and shared by all processed hits.
-	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, hitBitSet, maxStep, log);
+	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, maxStep, log);
 
 	return true;
 }
@@ -42,8 +41,7 @@ std::unique_ptr<GDigitizedData> GDosimeterDigitization::digitizeHitImpl(GHit* gh
 	//log->info(0, FUNCTION_NAME, "Edep: ", etot, ", hitn:", ghit->getEdeps().size());
 
 	// // Per-step information used to build the NIEL-weight.
-	// auto pids      = ghit->getPids();
-	// auto pEnergies = ghit->getEs();
+	// auto pids = ghit->getPids();
 	//
 	// double nielWeight = 0;
 	//

gemc/gdynamicDigitization/gFluxDigitization.cc

@@ -2,12 +2,11 @@
 
 // See header for API docs.
 bool GFluxDigitization::defineReadoutSpecsImpl() {
-	double timeWindow    = 10;                     // electronic readout time-window of the detector
-	double gridStartTime = 0;                      // defines the window grid
-	auto   hitBitSet     = HitBitSet("000001"); // defines what information to be stored in the hit
+	double timeWindow    = 10;   // electronic readout time-window of the detector
+	double gridStartTime = 0;   // defines the window grid
 	double maxStep       = 1 * CLHEP::mm;
 
-	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, hitBitSet, maxStep, log);
+	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, maxStep, log);
 
 	return true;
 }

gemc/gdynamicDigitization/gParticleCounterDigitization.cc

@@ -2,12 +2,11 @@
 
 // See header for API docs.
 bool GParticleCounterDigitization::defineReadoutSpecsImpl() {
-	double timeWindow    = 10;                     // electronic readout time-window of the detector
-	double gridStartTime = 0;                      // defines the window grid
-	auto   hitBitSet     = HitBitSet("000001"); // defines what information to be stored in the hit
+	double timeWindow    = 10;   // electronic readout time-window of the detector
+	double gridStartTime = 0;   // defines the window grid
 	double maxStep       = 1 * CLHEP::mm;
 
-	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, hitBitSet, maxStep, log);
+	readoutSpecs = std::make_shared<GReadoutSpecs>(timeWindow, gridStartTime, maxStep, log);
 
 	return true;
 }

gemc/gdynamicDigitization/gdynamicdigitization.cc

@@ -26,8 +26,7 @@ std::unique_ptr<GTrueInfoData> GDynamicDigitization::collectTrueInformationImpl(
 
 
 
-	// Bit 0 is expected to contain the always-present true-hit quantities.
-	ghit->calculateInfosForBit(0);
+	ghit->calculateInfos();
 
 	// Average positions are computed at the hit level by GHit and returned here.
 	G4ThreeVector avgGlobalPos = ghit->getAvgGlobaPosition();

gemc/gdynamicDigitization/greadoutSpecs.h

@@ -6,23 +6,21 @@
  *
  * GReadoutSpecs represents the (simple) electronics timing model needed by digitization:
  * a time window defines the width of one electronics time bin, and a grid start time
- * defines the phase (offset) of that binning. A HitBitSet encodes which hit information
- * is computed/stored.
+ * defines the phase (offset) of that binning.
  *
  * \note
  * This header intentionally does not declare a \c \\mainpage. Module-level documentation
  * for gdynamic digitization lives in gdynamicdigitizationDoxy.h.
  */
 
-#include <gemc/ghit/ghitConventions.h> // HitBitSet
 #include <gemc/glogging/glogger.h>
 
 #include <cmath>
 #include <type_traits>
 
 /**
  * \class GReadoutSpecs
- * \brief Immutable readout timing and storage specification.
+ * \brief Immutable readout timing specification.
  *
  * Instances of this class are typically constructed by digitization plugins inside
  * \ref GDynamicDigitization::defineReadoutSpecs "defineReadoutSpecs()" and then shared
@@ -40,11 +38,7 @@ class GReadoutSpecs
 	/// Time offset (origin) of the electronics time grid.
 	double gridStartTime;
 
-	/// Bitset controlling which hit information is computed/stored.
-	HitBitSet hitBitSet;
-
-	// the corresponding logical volume will its user limits to
-	// G4UserLimits(maxStep, maxStep));
+	/// Maximum step length for the associated logical volume.
 	double maxStep;
 
 public:
@@ -55,30 +49,19 @@ class GReadoutSpecs
 	 *
 	 * \param tw Electronics time window (width of one time cell).
 	 * \param gst Grid start time (time offset for binning).
-	 * \param hbs Hit bitset controlling which hit fields are stored/computed.
-	 * \param ms Max step for the logical volume
+	 * \param ms Max step for the logical volume.
 	 * \param log Logger used for informational output.
 	 */
 	GReadoutSpecs(const double                    tw,
 				  const double                    gst,
-				  const HitBitSet                 hbs,
 				  const double                    ms,
 				  const std::shared_ptr<GLogger>& log) :
 		timeWindow(tw),
 		gridStartTime(gst),
-		hitBitSet(hbs),
 		maxStep(ms) {
-		log->info(1, "GReadoutSpecs: timeWindow=", timeWindow, ", gridStartTime=", gridStartTime, ", hitBitSet=",
-				  hitBitSet);
+		log->info(1, "GReadoutSpecs: timeWindow=", timeWindow, ", gridStartTime=", gridStartTime);
 	}
 
-	/**
-	 * \brief Returns the configured hit bitset.
-	 *
-	 * \return The HitBitSet that defines what hit information is stored.
-	 */
-	[[nodiscard]] inline HitBitSet getHitBitSet() const { return hitBitSet; }
-
 	[[nodiscard]] inline double getMaxStep() const { return maxStep; }
 
 	/**

gemc/ghit/addHitInfos.cc

@@ -9,36 +9,30 @@
 
 // See header for API docs.
 
-void GHit::addHitInfosForBitset(const HitBitSet hbs, const G4Step* step) {
-	// Preconditions:
-	// - 'step' must be non-null (callers provide a valid G4Step from the stepping action).
-	// - 'gtouchable' must be valid; it provides energy scaling and identity/dimensions.
-
+void GHit::addHitInfos(const G4Step* step) {
 	auto preStepPoint = step->GetPreStepPoint();
-	// auto poststepPoint = step->GetPostStepPoint();
 
 	auto touchable = preStepPoint->GetTouchable();
 
-	// Get the global position and transform it to local coordinates of the touchable.
+	// Global position and its local-coordinate transform.
 	G4ThreeVector xyz  = preStepPoint->GetPosition();
 	G4ThreeVector xyzL = touchable->GetHistory()->GetTopTransform().TransformPoint(xyz);
 
 	globalPositions.push_back(xyz);
 	localPositions.push_back(xyzL);
 
-	// Retrieve energy deposition and time information.
-	// Energy is scaled by the detector-specific multiplier from GTouchable.
+	// Energy deposition (scaled by detector multiplier) and global time.
 	double edep = (step->GetTotalEnergyDeposit()) * (gtouchable->getEnergyMultiplier());
 	double time = preStepPoint->GetGlobalTime();
 
 	edeps.push_back(edep);
 	times.push_back(time);
 
-	auto track = step->GetTrack();
-	auto trackVertex = track->GetVertexPosition();
-	int  trackId = track->GetTrackID();
+	auto track         = step->GetTrack();
+	auto trackVertex   = track->GetVertexPosition();
+	int  trackId       = track->GetTrackID();
 	int  motherTrackId = track->GetParentID();
-	int  currentPdg = track->GetDefinition()->GetPDGEncoding();
+	int  currentPdg    = track->GetDefinition()->GetPDGEncoding();
 
 	trackVertexById.emplace(trackId, trackVertex);
 	pdgById.emplace(trackId, currentPdg);
@@ -66,39 +60,7 @@ void GHit::addHitInfosForBitset(const HitBitSet hbs, const G4Step* step) {
 	trackEs.push_back(preStepPoint->GetTotalEnergy());
 	motherPids.push_back(motherPdg);
 
-
-	// Iterate over each bit and call the helper method to add optional info.
-	for (size_t hbIndex = 0; hbIndex < hbs.size(); hbIndex++) {
-		addHitInfosForBitIndex(hbIndex, hbs.test(hbIndex), step);
-	}
-}
-
-bool GHit::addHitInfosForBitIndex(size_t bitIndex, const bool test, const G4Step* thisStep) {
-	// If the bit is not enabled, do nothing.
-	if (!test) return false;
-
-	G4Track*     trk     = thisStep->GetTrack();
-	G4StepPoint* prestep = thisStep->GetPreStepPoint();
-
-	// Bit 0: record particle ID, per-step total energy, and creator process name (if available).
-	if (bitIndex == 0) {
-		pids.push_back(trk->GetDefinition()->GetPDGEncoding());
-		Es.push_back(prestep->GetTotalEnergy());
-		if (trk->GetCreatorProcess()) {
-			processNames.push_back(trk->GetCreatorProcess()->GetProcessName());
-		}
-	}
-	else if (bitIndex == 1) {
-		// Placeholder: record step length and track info.
-	}
-	else if (bitIndex == 2) {
-		// Placeholder: record mother particle track information.
-	}
-	else if (bitIndex == 3) {
-		// Placeholder: record meta information.
-	}
-	else if (bitIndex == 4) {
-		// Placeholder: record optical photon-specific information.
+	if (track->GetCreatorProcess()) {
+		processNames.push_back(track->GetCreatorProcess()->GetProcessName());
 	}
-	return true;
 }