From 39b7da09ce8fdad5eb33d97f186176e7f2e4b149 Mon Sep 17 00:00:00 2001
From: Joe Ramsay <joseph.ramsay@stfc.ac.uk>
Date: Thu, 24 May 2018 14:00:30 +0100
Subject: [PATCH] Re #22468 Undo accidental change to calibrate.py
---
.../Diffraction/isis_powder/routines/calibrate.py | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/scripts/Diffraction/isis_powder/routines/calibrate.py b/scripts/Diffraction/isis_powder/routines/calibrate.py
index e58491febac..9d3a33ca214 100644
--- a/scripts/Diffraction/isis_powder/routines/calibrate.py
+++ b/scripts/Diffraction/isis_powder/routines/calibrate.py
@@ -21,18 +21,9 @@ def create_van(instrument, run_details, absorb):
input_batching=INPUT_BATCHING.Summed)
input_van_ws = input_van_ws_list[0] # As we asked for a summed ws there should only be one returned
- print("hasattr(instrument._inst_settings, \"subtract_empty_inst\") = {}\n"
- "instrument._inst_settings.subtract_empty_inst = {}".
- format(hasattr(instrument._inst_settings, "subtract_empty_inst"),
- instrument._inst_settings.subtract_empty_inst))
- if not hasattr(instrument._inst_settings, "subtract_empty_inst") or instrument._inst_settings.subtract_empty_inst:
- print("subtracting")
- corrected_van_ws = common.subtract_summed_runs(ws_to_correct=input_van_ws,
- empty_sample_ws_string=run_details.empty_runs,
- instrument=instrument)
- else:
- print("not subtracting")
- corrected_van_ws = input_van_ws
+ corrected_van_ws = common.subtract_summed_runs(ws_to_correct=input_van_ws,
+ empty_sample_ws_string=run_details.empty_runs,
+ instrument=instrument)
# Crop the tail end of the data on PEARL if they are not capturing slow neutrons
corrected_van_ws = instrument._crop_raw_to_expected_tof_range(ws_to_crop=corrected_van_ws)
--
GitLab