refs #8614 Dealing with consequences of ill defined merge

Some code pieces came not valid
mantidproject · Jan 14, 2014 · b969201 · b969201
1 parent 3509771
commit b969201
Showing 1 changed file with 7 additions and 0 deletions.
diff --git 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 :