Skip to content

Commit

Permalink
Re #5042 Make range selection widget pop up faster
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdoucet
mdoucet committed Mar 30, 2012
1 parent 5214b5d commit a4eb4f1
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 80 deletions.
5 changes: 0 additions & 5 deletions Code/Mantid/scripts/Interface/reduction_gui/widgets/reflectometer/refm_reduction.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1017,11 +1017,6 @@ def get_editing_state(self):
roi1_to = int(self._summary.norm_background_to_pixel1.text())
m.NormBackgroundRoi = [roi1_from, roi1_to]

#m.q_min = float(self._summary.q_min_edit.text())
#m.q_step = float(self._summary.q_step_edit.text())
#if self._summary.log_scale_chk.isChecked():
# m.q_step = -m.q_step

if hasattr(m, "set_detector_angle"):
m.set_detector_angle = self._summary.det_angle_check.isChecked()
m.detector_angle = util._check_and_get_float_line_edit(self._summary.det_angle_edit)
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/scripts/Interface/ui/reflectometer/refm_reduction.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1154,7 +1154,7 @@ p, li { white-space: pre-wrap; }
</size>
</property>
<property name="text">
<string>Counts vs PIxel</string>
<string>Counts vs Pixel</string>
</property>
</widget>
</item>
Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/scripts/Interface/ui/reflectometer/ui_refm_reduction.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'ui/reflectometer/refm_reduction.ui'
#
# Created: Thu Mar 29 16:28:17 2012
# Created: Fri Mar 30 10:27:22 2012
# by: PyQt4 UI code generator 4.7.4
#
# WARNING! All changes made in this file will be lost!
Expand Down Expand Up @@ -1266,7 +1266,7 @@ def retranslateUi(self, Frame):
self.data_background_from_pixel1.setText(QtGui.QApplication.translate("Frame", "0", None, QtGui.QApplication.UnicodeUTF8))
self.data_background_to_pixel1_label.setText(QtGui.QApplication.translate("Frame", "to pixel", None, QtGui.QApplication.UnicodeUTF8))
self.data_background_to_pixel1.setText(QtGui.QApplication.translate("Frame", "0", None, QtGui.QApplication.UnicodeUTF8))
self.plot_count_vs_y_bck_btn.setText(QtGui.QApplication.translate("Frame", "Counts vs PIxel", None, QtGui.QApplication.UnicodeUTF8))
self.plot_count_vs_y_bck_btn.setText(QtGui.QApplication.translate("Frame", "Counts vs Pixel", None, QtGui.QApplication.UnicodeUTF8))
self.data_low_res_range_switch.setText(QtGui.QApplication.translate("Frame", "Low-Res axis range ", None, QtGui.QApplication.UnicodeUTF8))
self.data_low_res_from_label.setText(QtGui.QApplication.translate("Frame", "from pixel", None, QtGui.QApplication.UnicodeUTF8))
self.x_min_edit.setText(QtGui.QApplication.translate("Frame", "0", None, QtGui.QApplication.UnicodeUTF8))
Expand Down
147 changes: 75 additions & 72 deletions Code/Mantid/scripts/reduction/instruments/reflectometer/data_manipulation.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,72 +40,75 @@ def counts_vs_pixel_distribution(file_path, is_pixel_y=True, callback=None,
high_res = True, instrument="REFL"):
basename = os.path.basename(file_path)
ws_base = "__%s" % basename
ws_output_base = "Counts vs Y pixel"
ws_output_base = "Counts vs Y pixel - %s" % basename
x_title = "Y pixel"
if is_pixel_y is False:
ws_output_base = "Counts vs X pixel"
ws_output_base = "Counts vs X pixel - %s" % basename
x_title = "X pixel"

ws_list = []

def _load_entry(entry, ws, title=""):
if not mtd.workspaceExists(ws):
LoadEventNexus(Filename=file_path, OutputWorkspace=ws,
NXentryName=entry)
if mtd[ws].getNumberEvents()==0:
mtd.deleteWorkspace(ws)
return

# 1D plot
ws_output = "%s %s" % (ws_output_base, title)

instr_dir = mtd.getSettings().getInstrumentDirectory()
if is_pixel_y:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_X.xml")
GroupDetectors(InputWorkspace=ws, OutputWorkspace=ws_output,
MapFile=grouping_file)
if mtd.workspaceExists(ws_output):
ws_list.append(ws_output)
else:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_Y.xml")
GroupDetectors(InputWorkspace=ws, OutputWorkspace=ws_output,
MapFile=grouping_file)

Transpose(InputWorkspace=ws_output, OutputWorkspace=ws_output)

# The Y pixel numbers start at 1 from the perspective of the users
# They also read in reversed order
if False and is_pixel_y:
x=mtd[ws_output].dataX(0)
y_reversed=mtd[ws_output].dataY(0)
y=[i for i in y_reversed]
for i in range(len(x)):
x[i] += 1
y_reversed[i] = y[len(y)-1-i]
if not mtd.workspaceExists(ws):
LoadEventNexus(Filename=file_path, OutputWorkspace=ws,
NXentryName=entry)

if mtd[ws].getNumberEvents()==0:
#mtd.deleteWorkspace(ws)
return

instr_dir = mtd.getSettings().getInstrumentDirectory()
if is_pixel_y:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_X.xml")
GroupDetectors(InputWorkspace=ws, OutputWorkspace=ws_output,
MapFile=grouping_file)
else:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_Y.xml")
GroupDetectors(InputWorkspace=ws, OutputWorkspace=ws_output,
MapFile=grouping_file)

Transpose(InputWorkspace=ws_output, OutputWorkspace=ws_output)

# Copy over the units
units = mtd[ws_output].getAxis(0).getUnit().name()
mtd[ws_output].getAxis(0).setUnit(units)

ws_list.append(ws_output)
# The Y pixel numbers start at 1 from the perspective of the users
# They also read in reversed order
if False and is_pixel_y:
x=mtd[ws_output].dataX(0)
y_reversed=mtd[ws_output].dataY(0)
y=[i for i in y_reversed]
for i in range(len(x)):
x[i] += 1
y_reversed[i] = y[len(y)-1-i]

# Copy over the units
units = mtd[ws_output].getAxis(0).getUnit().name()
mtd[ws_output].getAxis(0).setUnit(units)

# 2D plot
output_2d = ws_output+'_2D'
Rebin(InputWorkspace=ws,OutputWorkspace=output_2d,Params="0,200,200000")
if is_pixel_y:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_X.xml")
GroupDetectors(InputWorkspace=output_2d, OutputWorkspace=output_2d,
MapFile=grouping_file)
else:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_Y.xml")
GroupDetectors(InputWorkspace=output_2d, OutputWorkspace=output_2d,
MapFile=grouping_file)
ws_list.append(ws_output)

# 2D plot
output_2d = ws_output+'_2D'
Rebin(InputWorkspace=ws,OutputWorkspace=output_2d,Params="0,200,200000")
if is_pixel_y:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_X.xml")
GroupDetectors(InputWorkspace=output_2d, OutputWorkspace=output_2d,
MapFile=grouping_file)
else:
grouping_file = os.path.join(instr_dir, "Grouping",
"REFL_Detector_Grouping_Sum_Y.xml")
GroupDetectors(InputWorkspace=output_2d, OutputWorkspace=output_2d,
MapFile=grouping_file)

if instrument=="REFM":
for p in ['Off_Off', 'On_Off', 'Off_On', 'On_On']:
ws = '%s_%s'%(ws_base,p)
ws = '%s - %s'%(ws_base,p)
_load_entry("entry-%s" % p, ws, p)
else:
_load_entry("entry", ws_base)
Expand Down Expand Up @@ -158,41 +161,41 @@ def _load_entry(entry, ws, title=""):
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')

if not mtd.workspaceExists(ws):
sangle = 0
dangle = 0
dangle0 = 0
direct_beam_pix = 0
det_distance = 2.562

ws = "__%s_metadata" % run
if instrument=="REFM":
ws = '%s_%s'%(ws, 'Off_Off')

if not mtd.workspaceExists(ws):
f = FileFinder.findRuns("%s%s" % (instrument, run))
if len(f)>0:
LoadEventNexus(Filename=f[0], OutputWorkspace=ws,
NXentryName='entry-Off_Off', MetaDataOnly=True)
sangle = 0

if mtd.workspaceExists(ws):
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]

det_distance = 2.562
if mtd[ws].getRun().hasProperty("SampleDetDis"):
det_distance = mtd[ws].getRun().getProperty("SampleDetDis").value[0]/1000.0

return {"SANGLE":sangle,
"DANGLE":dangle,
"DANGLE0":dangle0,
"DIRPIX":direct_beam_pix,
"DET_DISTANCE":det_distance}


return {"SANGLE":sangle,
"DANGLE":dangle,
"DANGLE0":dangle0,
"DIRPIX":direct_beam_pix,
"DET_DISTANCE":det_distance}

0 comments on commit a4eb4f1

Please sign in to comment.