WORK IN PROGRESS

OpenGATE · May 13, 2024 · d2c4186 · d2c4186
1 parent 0986146
commit d2c4186
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 1 deletion.
diff --git a/core/opengate_core/g4_bindings/chemistryadaptator.h b/core/opengate_core/g4_bindings/chemistryadaptator.h
@@ -11,6 +11,7 @@
 #include <functional>
 
 class G4DNAMolecularReactionTable;
+#include <G4DNAMolecularReactionTable.hh>
 
 template <typename C> class ChemistryAdaptator : public C {
 public:
@@ -25,11 +26,14 @@ template <typename C> class ChemistryAdaptator : public C {
 
   void
   ConstructTimeStepModel(G4DNAMolecularReactionTable *reactionTable) override {
+		G4cerr << "-- ChemistryAdaptator::ConstructTimeStepModel" << G4endl;
     C::ConstructTimeStepModel(reactionTable);
+		reactionTable->PrintTable();
   }
 
   void
   ConstructReactionTable(G4DNAMolecularReactionTable *reactionTable) override {
+		G4cerr << "-- ChemistryAdaptator::ConstructReactionTable" << G4endl;
     C::ConstructReactionTable(reactionTable);
     if (_constructReactionTableHook)
       _constructReactionTableHook(reactionTable);

diff --git a/core/opengate_core/opengate_lib/GateChemistryActor.cpp b/core/opengate_core/opengate_lib/GateChemistryActor.cpp
@@ -68,6 +68,7 @@ void GateChemistryActor::Initialize(G4HCofThisEvent *hce) {
   {
     auto constructReactionTable =
         [&reactions = _reactions](G4DNAMolecularReactionTable *reactionTable) {
+					G4cerr << "-- constructReactionTable" << G4endl;
           reactionTable->Reset();
 
           for (auto const &reaction : reactions) {
@@ -87,6 +88,7 @@ void GateChemistryActor::Initialize(G4HCofThisEvent *hce) {
           reactionTable->PrintTable();
         };
 
+		G4cerr << "-- add constructReactionTableHook" << G4endl;
     ChemistryAdaptator<G4EmDNAChemistry_option3>::setConstructReactionTableHook(
         constructReactionTable);
   }
@@ -105,6 +107,7 @@ void GateChemistryActor::Initialize(G4HCofThisEvent *hce) {
 void GateChemistryActor::EndSimulationAction() {}
 
 void GateChemistryActor::EndOfRunAction(G4Run const *) {
+	G4cerr << "~~ DEBUG EndOfRunAction" << G4endl;
   for (auto &[molecule, map] : _speciesInfoPerTime) {
     for (auto &[time, data] : map) {
       data.g /= _nbEvents;   // mean value of g
@@ -114,6 +117,7 @@ void GateChemistryActor::EndOfRunAction(G4Run const *) {
 }
 
 void GateChemistryActor::EndOfEventAction(G4Event const *) {
+	G4cerr << "~~ DEBUG EndOfEventAction" << G4endl;
   auto *moleculeCounter = G4MoleculeCounter::Instance();
 
   if (not G4EventManager::GetEventManager()

diff --git a/core/opengate_core/opengate_lib/GateChemistryLongTimeActor.cpp b/core/opengate_core/opengate_lib/GateChemistryLongTimeActor.cpp
@@ -124,6 +124,8 @@ GateChemistryLongTimeActor::GateChemistryLongTimeActor(pybind11::dict &user_info
 
 	_doseCutOff = DictGetDouble(user_info, "dose_cutoff");
 
+	_resetScavengerForEachBeam = DictGetBool(user_info, "reset_scavenger_for_each_beam");
+
 	// TODO remove
 	_boundarySize = DictGetVecDouble(user_info, "boundary_size");
 }
@@ -134,6 +136,8 @@ void GateChemistryLongTimeActor::Initialize(G4HCofThisEvent *hce) {
 	_chemistryWorld = std::make_unique<ChemistryWorld>(this);
 	_chemistryWorld->ConstructChemistryComponents();
 
+	G4Scheduler::Instance()->ResetScavenger(_resetScavengerForEachBeam);
+
   G4MoleculeCounter::Instance()->SetVerbose(_moleculeCounterVerbose);
   G4MoleculeCounter::Instance()->Use();
   G4MoleculeCounter::Instance()->DontRegister(G4H2O::Definition());

diff --git a/core/opengate_core/opengate_lib/GateChemistryLongTimeActor.h b/core/opengate_core/opengate_lib/GateChemistryLongTimeActor.h
@@ -106,6 +106,8 @@ class GateChemistryLongTimeActor : public GateVActor {
 
 	double _doseCutOff = 0;
 
+	bool _resetScavengerForEachBeam = false;
+
 	// TODO remove
 	std::vector<double> _boundarySize;
 };

diff --git a/opengate/actors/chemistryactors.py b/opengate/actors/chemistryactors.py
@@ -62,6 +62,8 @@ def set_default_user_info(user_info):
 
         user_info.dose_cutoff = 0
 
+        user_info.reset_scavenger_for_each_beam = False
+
         # TODO remove
         user_info.boundary_size = [0.8 * g4_units.um, 0.8 * g4_units.um, 0.8 * g4_units.um]
 

diff --git a/opengate/managers.py b/opengate/managers.py
@@ -370,7 +370,7 @@ class PhysicsListManager(GateObject):
     )
 
     special_chemistry_constructor_classes = {}
-    #  special_chemistry_constructor_classes["G4EmDNAChemistry_option3"] = g4.G4EmDNAChemistry_option3
+    special_chemistry_constructor_classes["G4EmDNAChemistry_option3"] = g4.G4EmDNAChemistry_option3
 
     special_physics_constructor_classes["G4EmDNAChemistry"] = g4.G4EmDNAChemistry
     special_physics_constructor_classes["G4EmDNAChemistry_option1"] = (