Merge pull request #27 from neutrons/fix_template

Add dead time parameters to template
neutrons · Apr 26, 2024 · 4c4d3bc · 4c4d3bc
2 parents 97d09b4 + 347d370
commit 4c4d3bc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/reduction/lr_reduction/DeadTimeCorrection.py b/reduction/lr_reduction/DeadTimeCorrection.py
@@ -44,6 +44,7 @@ def PyExec(self):
         dead_time = self.getProperty("DeadTime").value
         tof_step = self.getProperty("TOFStep").value
         paralyzing = self.getProperty("Paralyzable").value
+        output_workspace = self.getPropertyValue("OutputWorkspace")
 
         # Rebin the data according to the tof_step we want to compute the correction with
         tof_min, tof_max = self.getProperty("TOFRange").value
@@ -54,7 +55,7 @@ def PyExec(self):
         _ws_sc = Rebin(InputWorkspace=ws_event_data, Params="%s,%s,%s" % (tof_min, tof_step, tof_max), PreserveEvents=False)
 
         # Get the total number of counts on the detector for each TOF bin per pulse
-        counts_ws = SumSpectra(_ws_sc)
+        counts_ws = SumSpectra(_ws_sc, OutputWorkspace=output_workspace)
 
         # If we have error events, add them since those are also detector triggers
         if ws_error_events is not None:

diff --git a/reduction/lr_reduction/reduction_template_reader.py b/reduction/lr_reduction/reduction_template_reader.py
@@ -68,6 +68,8 @@ def __init__(self):
         # Dead time correction
         self.dead_time:bool = False
         self.paralyzable:bool = True
+        self.dead_time_value = 4.2
+        self.dead_time_tof_step = 150
 
     def from_dict(self, data_dict, permissible=True):
         r"""
@@ -154,7 +156,8 @@ def to_xml(self):
         # Dead time correction
         _xml += "<dead_time_correction>%s</dead_time_correction>\n" % str(self.dead_time)
         _xml += "<dead_time_paralyzable>%s</dead_time_paralyzable>\n" % str(self.paralyzable)
-
+        _xml += "<dead_time_value>%s</dead_time_value>\n" % str(self.dead_time_value)
+        _xml += "<dead_time_tof_step>%s</dead_time_tof_step>\n" % str(self.dead_time_tof_step)
         _xml += "</RefLData>\n"
 
         return _xml
@@ -261,6 +264,10 @@ def from_xml_element(self, instrument_dom):
                                         default=self.dead_time)
         self.paralyzable = getBoolElement(instrument_dom, "dead_time_paralyzable",
                                           default=self.paralyzable)
+        self.dead_time_value = getFloatElement(instrument_dom, "dead_time_value",
+                                               default=self.dead_time_value)
+        self.dead_time_tof_step = getFloatElement(instrument_dom, "dead_time_tof_step",
+                                                  default=self.dead_time_tof_step)
 
 
 ###### Utility functions to read XML content ########################