Merge pull request #464 from OpenGATE/prevent_repeat_vol_for_digit

Prevent using digitizer on daughters of repeated volumes

.gitignore

@@ -91,6 +91,7 @@ opengate_temporaire
 /opengate/tests/src/demo_code_*.py
 /opengate/tests/src/test030_save
 /opengate/tests/src/test_log*
+/opengate/tests/src/save_tests
 
 /opengate/data/isomeric_transition/save
 /opengate/data/isomeric_transition/save2

core/opengate_core/opengate_lib/GateHelpersGeometry.cpp

@@ -19,6 +19,17 @@ void ComputeTransformationFromVolumeToWorld(const std::string &phys_volume_name,
   auto pvs = G4PhysicalVolumeStore::GetInstance();
   while (name != "world") {
     auto phys = pvs->GetVolume(name);
+    if (phys == nullptr) {
+      std::ostringstream oss;
+      oss << "The volume '" << name
+          << "' is not found. Here is the list of volumes: ";
+      auto map = pvs->GetMap();
+      for (auto m : map) {
+        oss << m.first << " ";
+      }
+      oss << std::endl;
+      Fatal(oss.str());
+    }
     auto tr = phys->GetObjectTranslation();
     // auto rot = *phys->GetObjectRotation();
     auto rot = phys->GetObjectRotationValue();

core/opengate_core/opengate_lib/digitizer/GateDigiCollection.cpp

@@ -224,6 +224,8 @@ GateDigiCollection::Iterator GateDigiCollection::NewIterator() {
 }
 
 std::string GateDigiCollection::DumpLastDigi() const {
+  if (GetSize() == 0)
+    return "";
   std::ostringstream oss;
   auto n = GetSize() - 1;
   for (auto *att : fDigiAttributes) {

core/opengate_core/opengate_lib/digitizer/GateDigitizerHitsCollectionActor.cpp

@@ -98,11 +98,13 @@ void GateDigitizerHitsCollectionActor::SteppingAction(G4Step *step) {
     // nb transportation
     auto post = step->GetPostStepPoint();
     auto process = post->GetProcessDefinedStep();
-    auto pname = process->GetProcessName();
-    static int nb_tr = 0;
-    if (pname == "Transportation") {
-      nb_tr++;
-      std::cout << pname << " " << nb_tr << " " << id << x << std::endl;
+    if (process != nullptr) {
+      auto pname = process->GetProcessName();
+      static int nb_tr = 0;
+      if (pname == "Transportation") {
+        nb_tr++;
+        std::cout << pname << " " << nb_tr << " " << id << x << std::endl;
+      }
     }
   }
 }

core/opengate_core/opengate_lib/digitizer/GateDigitizerProjectionActor.cpp

@@ -19,6 +19,7 @@ GateDigitizerProjectionActor::GateDigitizerProjectionActor(py::dict &user_info)
   fActions.insert("StartSimulationAction");
   fActions.insert("EndOfEventAction");
   fActions.insert("BeginOfRunAction");
+  fPhysicalVolumeName = "None";
 }
 
 GateDigitizerProjectionActor::~GateDigitizerProjectionActor() = default;
@@ -35,6 +36,10 @@ void GateDigitizerProjectionActor::InitializeCpp() {
   fImage = ImageType::New();
 }
 
+void GateDigitizerProjectionActor::SetPhysicalVolumeName(std::string name) {
+  fPhysicalVolumeName = name;
+}
+
 // Called when the simulation start
 void GateDigitizerProjectionActor::StartSimulationAction() {
   // Get input hits collection

core/opengate_core/opengate_lib/digitizer/GateDigitizerProjectionActor.h

@@ -29,9 +29,9 @@ class GateDigitizerProjectionActor : public GateVActor {
 
   ~GateDigitizerProjectionActor() override;
 
-  virtual void InitializeUserInput(py::dict &user_info) override;
+  void InitializeUserInput(py::dict &user_info) override;
 
-  virtual void InitializeCpp() override;
+  void InitializeCpp() override;
 
   // Called when the simulation start (master thread only)
   void StartSimulationAction() override;
@@ -42,6 +42,8 @@ class GateDigitizerProjectionActor : public GateVActor {
   // Called every time an Event ends (all threads)
   void EndOfEventAction(const G4Event *event) override;
 
+  void SetPhysicalVolumeName(std::string name);
+
   // Image type is 3D float by default
   typedef itk::Image<float, 3> ImageType;
   ImageType::Pointer fImage;

core/opengate_core/opengate_lib/digitizer/pyGateDigitizerProjectionActor.cpp

@@ -19,6 +19,6 @@ void init_GateDigitizerProjectionActor(py::module &m) {
              GateVActor>(m, "GateDigitizerProjectionActor")
       .def(py::init<py::dict &>())
       .def_readwrite("fImage", &GateDigitizerProjectionActor::fImage)
-      .def_readwrite("fPhysicalVolumeName",
-                     &GateDigitizerProjectionActor::fPhysicalVolumeName);
+      .def("SetPhysicalVolumeName",
+           &GateDigitizerProjectionActor::SetPhysicalVolumeName);
 }

opengate/actors/actoroutput.py

@@ -808,7 +808,7 @@ class ActorOutputRoot(ActorOutputBase):
 
     def get_output_path(self, *args, **kwargs):
         if "which" in kwargs and kwargs["which"] != "merged":
-            warning(
+            self.warn_user(
                 "Currently, GATE 10 only stores cumulative ROOT output per simulation ('merged'), "
                 "not data per run. Showing you the path to the ROOT file with cumulative data."
             )

opengate/actors/base.py

@@ -149,15 +149,13 @@ def __setstate__(self, state):
         self.__initcpp__()
         self.__update_interface_properties__()
 
-    # def __finalize_init__(self):
-    #     super().__finalize_init__()
-    #     # The following attributes exist. They are declared here to avoid warning
-    #     self.known_attributes.append("fFilters")
-    #     self.known_attributes.append("actor_engine")
-    #     self.known_attributes.append("user_output")
-    #     self.known_attributes.append("simulation")
-    #     self.known_attributes.append("__dict__")
-    #     self.known_attributes.append("output_filename")
+    def __finalize_init__(self):
+        super().__finalize_init__()
+        # The following attributes exist. They are declared here to avoid warning
+        # fFilters is not known here because ActorBase does not inherit from a cpp counterpart.
+        self.known_attributes.add("fFilters")
+        # output_filename is a property
+        self.known_attributes.add("output_filename")
 
     def to_dictionary(self):
         d = super().to_dictionary()