From b969201684376b5cab33fb2bd975a86151c69713 Mon Sep 17 00:00:00 2001
From: Alex Buts <Alex.Buts@stfc.ac.uk>
Date: Tue, 14 Jan 2014 11:19:20 +0000
Subject: [PATCH] refs #8614 Dealing with consequences of ill defined merge

Some code pieces came not valid
---
 Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
index 4fd671081185..4dbe8a8b41fa 100644
--- a/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
+++ b/Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
@@ -788,6 +788,13 @@ def load_data(self, runs,new_ws_name=None,keep_previous_ws=False):
         if hasattr(self, 'nexus_in_event_mode') and self.nexus_in_event_mode:
             event_mode = True;
 
+        if self.relocate_dets:
+            if self.__det_cal_file_ws:
+                calibration = self.__det_cal_file_ws
+            else:
+                calibration = self.det_cal_file
+        #}
+
         sum = True
         result_ws = common.load_runs(runs, sum)
         if new_ws_name != None :