Fix autocomplete error from pegless material addition

nrc-cnrc · Aug 30, 2024 · 88fda0d · 88fda0d
1 parent d99f7c6
commit 88fda0d
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/HEN_HOUSE/egs++/egs_input_struct.cpp b/HEN_HOUSE/egs++/egs_input_struct.cpp
@@ -200,7 +200,7 @@ vector<shared_ptr<EGS_SingleInput>> EGS_BlockInput::getSingleInputs() {
 }
 
 vector<shared_ptr<EGS_SingleInput>> EGS_BlockInput::getSingleInputs(string title) {
-    if (egsEquivStr(blockTitle, title) ||  (egsEquivStr(parent->getTitle(), "media definition") &&  egsEquivStr(blockTitle, "pegsless")) ||
+    if (egsEquivStr(blockTitle, title) ||  (parent != nullptr && egsEquivStr(parent->getTitle(), "media definition") &&  egsEquivStr(blockTitle, "pegsless")) ||
             // Handle the special case where "target shape" and "source shape" for egs_collimated_source need to match just "shape".
             (egsEquivStr(blockTitle, "shape") && (egsEquivStr(title, "target shape") || egsEquivStr(title, "source shape")))) {
         return singleInputs;
@@ -222,7 +222,7 @@ vector<shared_ptr<EGS_BlockInput>> EGS_BlockInput::getBlockInputs() {
 }
 
 vector<shared_ptr<EGS_BlockInput>> EGS_BlockInput::getBlockInputs(string title) {
-    if (egsEquivStr(blockTitle, title) || (egsEquivStr(parent->getTitle(), "media definition") &&  egsEquivStr(blockTitle, "pegsless")) ||
+    if (egsEquivStr(blockTitle, title) || (parent != nullptr && egsEquivStr(parent->getTitle(), "media definition") &&  egsEquivStr(blockTitle, "pegsless")) ||
             // Handle the special case where "target shape" and "source shape" for egs_collimated_source need to match just "shape".
             (egsEquivStr(blockTitle, "shape") && (egsEquivStr(title, "target shape") || egsEquivStr(title, "source shape")))) {
         return blockInputs;
@@ -259,7 +259,7 @@ shared_ptr<EGS_SingleInput> EGS_BlockInput::getSingleInput(string inputTag) {
 
 shared_ptr<EGS_SingleInput> EGS_BlockInput::getSingleInput(string inputTag, string title) {
     // First search the top-level input block
-    if (egsEquivStr(blockTitle, title) || (egsEquivStr(parent->getTitle(), "media definition") &&  egsEquivStr(blockTitle, "pegsless")) ||
+    if (egsEquivStr(blockTitle, title) || (parent != nullptr && egsEquivStr(parent->getTitle(), "media definition") &&  egsEquivStr(blockTitle, "pegsless")) ||
             // Handle the special case where "target shape" and "source shape" for egs_collimated_source need to match just "shape".
             (egsEquivStr(blockTitle, "shape") && (egsEquivStr(title, "target shape") || egsEquivStr(title, "source shape")))) {
         for (auto &inp: singleInputs) {
@@ -306,9 +306,11 @@ shared_ptr<EGS_BlockInput> EGS_BlockInput::getBlockInput(string title) {
         }
     }
 
-    if(egsEquivStr(parent->getTitle(), "media definition") && egsEquivStr(blockTitle, "pegsless")) {
-        return shared_from_this();
+    if(parent != nullptr && egsEquivStr(parent->getTitle(), "media definition") && egsEquivStr(blockTitle, "pegsless")) {
+            return shared_from_this();
+
     }
+
 
     return nullptr;
 }