add default settings dict, apply default if not in xml

Author: glass-ships

RefRed/configuration/loading_configuration.py

@@ -56,7 +56,8 @@ def run(self):
                 try:
                     self.loading()
                     message = "Done!"
-                except:
+                except Exception as e:
+                    logging.error(f"Error loading file: {e}")
                     message = "Error loading file: aborted"
             else:
                 message = "Loading aborted"

RefRed/interfaces/instrument_settings.py

@@ -13,6 +13,17 @@
 from RefRed.configuration.global_settings import GlobalSettings
 from RefRed.interfaces import load_ui
 
+DEFAULT_INSTRUMENT_SETTINGS = {
+    "apply_instrument_settings": False,
+    "source_detector_distance": 15.75,
+    "sample_detector_distance": 1.83,
+    "num_x_pixels": 256,
+    "num_y_pixels": 304,
+    "pixel_width": 0.70,
+    "xi_reference": 445,
+    "s1_sample_distance": 1.485,
+}
+
 
 class InstrumentSettingsEntryPoint(QGroupBox):
     def __init__(self, title="Instrument Settings"):
@@ -37,16 +48,12 @@ def initUI(self):
         self.applyCheckBox = QCheckBox("Apply", self)
         self.applyCheckBox.stateChanged.connect(self.toggleSettingsButton)
         self.settingsButton = QPushButton("Settings", self)
-        self.settingsButton.setEnabled(
-            # enabled if we use the correction
-            self.applyCheckBox.isChecked()
-        )
+        self.settingsButton.setEnabled(self.applyCheckBox.isChecked())
 
         # Create a horizontal layout for the checkbox and settings button
         hbox = QHBoxLayout()
         hbox.addWidget(self.applyCheckBox)
         hbox.addWidget(self.settingsButton)
-        # hbox.addStretch(1)  # This adds a stretchable space after the button (optional)
 
         # Set the layout for the group box
         self.setLayout(hbox)
@@ -129,14 +136,14 @@ class InstrumentSettings(GlobalSettings):
     """
 
     # pydantic fields
-    apply_instrument_settings: bool = False
-    source_detector_distance: float = 15.75
-    sample_detector_distance: float = 1.83
-    num_x_pixels: int = 256
-    num_y_pixels: int = 304
-    pixel_width: float = 0.70
-    xi_reference: float = 445
-    s1_sample_distance: float = 1.485
+    apply_instrument_settings: bool = DEFAULT_INSTRUMENT_SETTINGS["apply_instrument_settings"]
+    source_detector_distance: float = DEFAULT_INSTRUMENT_SETTINGS["source_detector_distance"]
+    sample_detector_distance: float = DEFAULT_INSTRUMENT_SETTINGS["sample_detector_distance"]
+    num_x_pixels: int = DEFAULT_INSTRUMENT_SETTINGS["num_x_pixels"]
+    num_y_pixels: int = DEFAULT_INSTRUMENT_SETTINGS["num_y_pixels"]
+    pixel_width: float = DEFAULT_INSTRUMENT_SETTINGS["pixel_width"]
+    xi_reference: float = DEFAULT_INSTRUMENT_SETTINGS["xi_reference"]
+    s1_sample_distance: float = DEFAULT_INSTRUMENT_SETTINGS["s1_sample_distance"]
 
     # class variable, translates fields to XML tag names, same names as the lr_reduction package
     def to_xml(self, indent: str = "") -> str:
@@ -193,9 +200,10 @@ def from_xml(self, node: Element):
             if len(tmp):
                 value = tmp[0].childNodes[0].nodeValue
                 setattr(self, field, converter(value))
-            # elif field == "apply_instrument_settings":
-            #     # old XML files don't have instrument settings, so we make sure it's not used.
-            #     setattr(self, "apply_instrument_settings", False)
+            else:
+                # if the field is not found in the XML, we use the default value
+                setattr(self, field, DEFAULT_INSTRUMENT_SETTINGS[field])
+
         return self
 
     def as_template_reader_dict(self) -> Dict[str, Any]: