From 871bab8c425226d85ad5f49c2ad49bde9807c20a Mon Sep 17 00:00:00 2001
From: Mathieu Doucet <doucetm@ornl.gov>
Date: Fri, 24 Feb 2012 16:54:12 -0500
Subject: [PATCH] Re #4792 Extract scattering angle details from logs
---
.../Interface/reduction_application.py | 5 ++-
.../reflectometer/data_manipulation.py | 31 +++++++++++++++++++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git a/Code/Mantid/scripts/Interface/reduction_application.py b/Code/Mantid/scripts/Interface/reduction_application.py
index a285274d32c..cfc7b977e59 100644
--- a/Code/Mantid/scripts/Interface/reduction_application.py
+++ b/Code/Mantid/scripts/Interface/reduction_application.py
@@ -286,6 +286,7 @@ class ReductionGUI(QtGui.QMainWindow, ui.ui_reduction_main.Ui_SANSReduction):
self.facility_combo.clear()
instruments = INSTRUMENT_DICT.keys()
instruments.sort()
+ instruments.reverse()
for facility in instruments:
self.facility_combo.addItem(QtGui.QApplication.translate("Dialog", facility, None, QtGui.QApplication.UnicodeUTF8))
@@ -294,7 +295,9 @@ class ReductionGUI(QtGui.QMainWindow, ui.ui_reduction_main.Ui_SANSReduction):
def _facility_changed(self, facility):
self.instr_combo.clear()
- for item in INSTRUMENT_DICT[unicode(facility)]:
+ instr_list = INSTRUMENT_DICT[unicode(facility)].keys()
+ instr_list.sort()
+ for item in instr_list:
if self.instrument_list is None or item in self.instrument_list:
self.instr_combo.addItem(QtGui.QApplication.translate("Dialog", item, None, QtGui.QApplication.UnicodeUTF8))
diff --git a/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py b/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py
index 51105960bd4..c1c63577140 100644
--- a/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py
+++ b/Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py
@@ -149,4 +149,35 @@ def counts_vs_pixel_distribution(file_path, is_pixel_y=True, callback=None,
mean = (min_id+max_id)/2.0
return mean-2*sigma, mean+2*sigma
+def get_logs(instrument, run):
+ f = FileFinder.findRuns("%s%s" % (instrument, run))
+ if len(f)>0:
+ basename = os.path.basename(f[0])
+ ws = "__%s" % basename
+ if instrument=="REFM":
+ ws = '%s_%s'%(ws, 'Off_Off')
+ LoadEventNexus(Filename=f[0], OutputWorkspace=ws,
+ NXentryName='entry-Off_Off', MetaDataOnly=True)
+
+ sangle = 0
+ if mtd[ws].getRun().hasProperty("SANGLE"):
+ sangle = mtd[ws].getRun().getProperty("SANGLE").value[0]
+
+ dangle = 0
+ if mtd[ws].getRun().hasProperty("DANGLE"):
+ dangle = mtd[ws].getRun().getProperty("DANGLE").value[0]
+
+ dangle0 = 0
+ if mtd[ws].getRun().hasProperty("DANGLE0"):
+ dangle0 = mtd[ws].getRun().getProperty("DANGLE0").value[0]
+
+ direct_beam_pix = 0
+ if mtd[ws].getRun().hasProperty("DIRPIX"):
+ direct_beam_pix = mtd[ws].getRun().getProperty("DIRPIX").value[0]
+
+ return {"SANGLE":sangle,
+ "DANGLE":dangle,
+ "DANGLE0":dangle0,
+ "DIRPIX":direct_beam_pix}
+
\ No newline at end of file
--
GitLab