From 0125ebedf606471142289acfeb43987002dc06c7 Mon Sep 17 00:00:00 2001 From: Wenduo Zhou Date: Fri, 10 Apr 2015 17:23:51 -0400 Subject: [PATCH] Refs #11289. Checkpointing progress on 3 tabs. --- .../HfirPDReductionControl.py | 83 +++++-- .../HFIRPowderReduction/HfirPDReductionGUI.py | 210 ++++++++++++------ .../scripts/HFIRPowderReduction/README.md | 21 +- .../HFIRPowderReduction/Ui_MainWindow.py | 135 ++++++----- .../HFIRPowderReduction/Ui_MainWindow.ui | 61 ++++- .../HFIRPowderReduction/testGUI_IndvDet.py | 2 + .../HFIRPowderReduction/testGUI_RawDetect.py | 11 +- .../testGUI_vanadiumPeak.py | 12 +- 8 files changed, 366 insertions(+), 169 deletions(-) diff --git a/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionControl.py b/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionControl.py index 2369c4d3c1d5..2b13d784fcd4 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionControl.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionControl.py @@ -94,32 +94,70 @@ def __init__(self): return + def getIndividualDetCounts(self, exp, scan, detid, xlabel): + """ Get individual detector counts + """ + # check and get data + if self._myWorkspaceDict.has_key((exp, scan)) is False: + raise NotImplementedError("Exp %d Scan %d does not have reduced \ + workspace." % (exp, scan)) + else: + rmanager = self._myWorkspaceDict[(exp, scan)] + # END-IF-ELSE + + # get raw counts + # FIXME : use **args + if xlabel is None: + tempoutws = api.GetSpiceDataRawCountsFromMD( + InputWorkspace=rmanager.datamdws, + MonitorWorkspace=rmanager.monitormdws, + Mode='Detector', + DetectorID = detid) + else: + tempoutws = api.GetSpiceDataRawCountsFromMD( + InputWorkspace=rmanager.datamdws, + MonitorWorkspace=rmanager.monitormdws, + Mode='Detector', + DetectorID = detid, + XLabel=xlabel) + + vecx = tempoutws.readX(0)[:] + vecy = tempoutws.readY(0)[:] + + return (vecx, vecy) + + def getRawDetectorCounts(self, exp, scan, ptnolist=None): """ Return raw detector counts as a list of 3-tuples """ - # check + # check and get data if self._myWorkspaceDict.has_key((exp, scan)) is False: raise NotImplementedError("Exp %d Scan %d does not have reduced \ workspace." % (exp, scan)) + else: + rmanager = self._myWorkspaceDict[(exp, scan)] + # END-IF-ELSE + + # get the complete list of Pt. number + if ptnolist is None: + ptnolist = self._getRunNumberList(datamdws=rmanager.datamdws) + + rlist = [] + # Loop over all Pt. number + for pt in ptnolist: + # get data + tempoutws = api.GetSpiceDataRawCountsFromMD( + InputWorkspace=rmanager.datamdws, + MonitorWorkspace=rmanager.monitormdws, + Mode='Pt.', + Pt = pt) + + vecx = tempoutws.readX(0)[:] + vecy = tempoutws.readY(0)[:] + + rlist.append((pt, vecx, vecy)) + # ENDFOR - # get data - rmanager = self._myWorkspaceDict[(exp, scan)] - datamdws = rmanager.datamdws - - # FIXME - This is a fake - import random - random.seed(1) - x0 = random.random()*40. - listx = [] - listy = [] - for i in xrange(44): - listx.append(x0+float(i)) - listy.append(random.random()*20.) - vecx = numpy.array(listx) - vecy = numpy.array(listy) - ptno = random.randint(1, 45) - - rlist = [(ptno, vecx, vecy)] return (rlist) @@ -488,8 +526,11 @@ def downloadFile(url, localfilepath): Test: 'http://neutron.ornl.gov/user_data/hb2a/exp400/Datafiles/HB2A_exp0400_scan0001.dat' """ # open URL - response = urllib2.urlopen(url) - wbuf = response.read() + try: + response = urllib2.urlopen(url) + wbuf = response.read() + except urllib2.HTTPError as e: + raise NotImplementedError("Unable to download file from %s\n\tCause: %s." % (url, str(e))) if wbuf.count('not found') > 0: return (False, "File cannot be found at %s." % (url)) diff --git a/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionGUI.py b/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionGUI.py index 51d251637cee..9d94d5d649bc 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionGUI.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/HfirPDReductionGUI.py @@ -369,27 +369,40 @@ def doLoadData(self): else: # itab = 4 unit = 'dSpacing' - raise NotImplementedError("Need to read in values!") + try: + xmin, binsize, xmax = self._uiGetBinningParams(xmin_w=self.ui.lineEdit_minD, + binsize_w=self.ui.lineEdit_binsizeD, + xmax_w=self.ui.lineEdit_maxD) + except Exception as e: + self._logError(str(e)) + return # END-IF-ELSE - # Reduce data + # Reduce data execstatus = self._myControl.reduceSpicePDData(expno, scanno, \ datafilename, unit, xmin, xmax, binsize, wavelength) - print "[DB] reduction status = ", execstatus + print "[DB] reduction status = %s, Binning = %s, %s, %s" % (str(execstatus), + str(xmin), str(binsize), str(xmax)) # Plot data if execstatus is True: if itab == 2: - # + # tab 'normalized' clearcanvas = self.ui.checkBox_clearPrevious.isChecked() xlabel = self._getXLabelFromUnit(unit) self._plotReducedData(expno, scanno, self.ui.graphicsView_reducedData, \ xlabel, label="Exp %d Scan %d Bin = %.5f" % (expno, scanno, binsize), \ clearcanvas=clearcanvas) else: - # - raise NotImplementedError("ASAP for vanadium") + # tab 'vanadium' + clearcanvas = True + xlabel = self._getXLabelFromUnit(unit) + print "[DB] Unit %s has label %s." % (unit, xlabel) + canvas = self.ui.graphicsView_vanPeaks + self._plotReducedData(expno, scanno, canvas, \ + xlabel, label="Exp %d Scan %d Bin = %.5f" % (expno, scanno, binsize), \ + clearcanvas=clearcanvas) # ENDIF(execstatus) # END-IF-ELSE (itab) @@ -600,6 +613,8 @@ def doPlotIndvDet(self): return xlabel = str(self.ui.comboBox_indvDetXLabel.currentText()) + if xlabel.strip() == "": + xlabel = None # plot try: @@ -640,8 +655,18 @@ def doPlotRawDet(self): ptNo = None # plot - self._plotRawDetSignal(expno, scanno, plotmode, ptNo, doOverPlot) + print "[DB] Plot Raw Detector: PlotMode = %s." % (plotmode) + execstatus = self._plotRawDetSignal(expno, scanno, plotmode, ptNo, doOverPlot) + + # set global values if good + if execstatus is True: + self._ptNo = ptNo + self._expNo = expno + self._scanNo = scanno + else: + print "[Error] Execution fails with signal %s. " % (str(execstatus)) + return def doPlotPrevDetRaw(self): @@ -670,17 +695,19 @@ def doPlotPrevDetRaw(self): def doPlotNextDetRaw(self): - """ Plot next raw detector signals + """ Plot next raw detector signals for an individual detector """ + raise NotImplementedError("ASAP") + # check - if self._ptNo is not None and self._detNo is not None: + if self._ptNo is not None: detno = self._detNo + 1 else: self._logError("Unable to plot previous raw detector \ because Pt. or Detector ID has not been set up yet.") return - # det number minus 1 + # det number plus 1 status, errmsg = self._checkValidPtDet(self._ptNo, detno) if status is False: self._logError(errmsg) @@ -693,92 +720,97 @@ def doPlotNextDetRaw(self): return - - def doPlotPrevPtRaw(self): - """ Plot previous raw detector + def doPlotNextPtRaw(self): + """ Plot next raw detector signals """ # check - if self._ptNo is not None and self._detNo is not None: - ptno = self._ptNo - 1 + if self._ptNo is not None: + ptno = self._ptNo + 1 else: self._logError("Unable to plot previous raw detector \ because Pt. or Detector ID has not been set up yet.") return - # det number minus 1 - status, errmsg = self._checkValidPtDet(self._ptNo, detno) - if status is False: - self._logError(errmsg) - else: + # get plot mode and plot + plotmode = str(self.ui.comboBox_rawDetMode.currentText()) + overplot = bool(self.ui.checkBox_overpltRawDet.isChecked()) + execstatus = self._plotRawDetSignal(self._expNo, self._scanNo, plotmode, + ptno, overplot) + + # update if it is good to plot + if execstatus is True: self._ptNo = ptno self.ui.lineEdit_ptNo.setText(str(self._ptNo)) - # plot - self._plotRawDetSignal(self._ptNo, self._detNo) - return - def doPlotNextPtRaw(self): - """ Plot next raw detector signals + def doPlotPrevPtRaw(self): + """ Plot previous raw detector """ # check - if self._ptNo is not None and self._detNo is not None: - ptno = self._ptN + 1 + if self._ptNo is not None: + ptno = self._ptNo - 1 else: self._logError("Unable to plot previous raw detector \ because Pt. or Detector ID has not been set up yet.") return + + # get plot mode and do plt + plotmode = str(self.ui.comboBox_rawDetMode.currentText()) + overplot = bool(self.ui.checkBox_overpltRawDet.isChecked()) + execstatus = self._plotRawDetSignal(self._expNo, self._scanNo, plotmode, + ptno, overplot) - # det number minus 1 - status, errmsg = self._checkValidPtDet(self._ptNo, detno) - if status is False: - self._logError(errmsg) - else: - self._ptNo = ptno + # update if it is good to plot + if execstatus is True: + self._ptNo = ptno self.ui.lineEdit_ptNo.setText(str(self._ptNo)) - # plot - self._plotRawDetSignal(self._ptNo, self._detNo) - return + def doRebinD(self): """ Rebin MDEventWorkspaces in d-Spacing. for pushButton_rebinD in vanadium peak strip tab - """ - self._uiRebinPlot(unit='dSpacing', xmin=self.ui.lineEdit_minD.text(), - binsize=self.ui.lineEdit_binsizeD.text(), - xmax=self.ui.lineEdit_maxD.text(), - canvas=self.ui.graphicsView_vanPeaks) - return - - dminstr = str(self.ui.lineEdit_minD.text()).strip() - dmaxstr = str(self.ui.lineEdit_maxD.text()).strip() - dbinsizestr = str(self.ui.lineEdit_binsizeD.text()).strip() - - # dmin and dmax - if len(dminstr) == 0 or len(dmaxstr) == 0: - dmin = None - dmax = None - else: - dmin = float(dminstr) - dmax = float(dmaxstr) + """ + # exp number an scan number + try: + expno, scanno = self._uiGetExpScanNumber() + except Exception as e: + self._logError("Error to get Exp and Scan due to %s." % (str(e))) + return False - # bin size - if len(dbinsizestr) == 0: - self._logError("Bin size in d-spacing must be specified!") - return - else: - binsize = float(dbinsizestr) + # wave length + wavelength = float(self.ui.lineEdit_wavelength.text()) - # rebin - self._rebin('dSpacing', dmin, binsize, dmax) - - self._plotReducedData(xlabel, 0, True) + # get new binning parameters + unit = 'dSpacing' + try: + xmin, binsize, xmax = self._uiGetBinningParams(xmin_w=self.ui.lineEdit_minD, + binsize_w=self.ui.lineEdit_binsizeD, + xmax_w=self.ui.lineEdit_maxD) + except Exception as e: + self._logError(str(e)) + return False + + # Reduce data + execstatus = self._myControl.rebin(expno, scanno, unit, wavelength, \ + xmin, binsize, xmax) + print "[DB] reduction status = %s, Binning = %s, %s, %s" % (str(execstatus), + str(xmin), str(binsize), str(xmax)) + + # Plot data + clearcanvas = True + xlabel = self._getXLabelFromUnit(unit) + print "[DB] Unit %s has label %s." % (unit, xlabel) + canvas = self.ui.graphicsView_vanPeaks + self._plotReducedData(expno, scanno, canvas, \ + xlabel, label="Exp %d Scan %d Bin = %.5f" % (expno, scanno, binsize), \ + clearcanvas=clearcanvas) - return + return True def doSaveData(self): @@ -825,6 +857,10 @@ def doStripVandiumPeaks(self): self._plotVanadiumRun(xlabel, 0, True) + + + raise NotImplementedError("ASAP") + return @@ -1018,10 +1054,37 @@ def _plotIndividualDetCounts(self, expno, scanno, detid, xlabel): self._myControl.loadSpicePDData(expno, scanno, filename) # pop out the xlabel list + # FIXME - Only need to set up once! floatsamplelognamelist = self._myControl.getSampleLogNames(expno, scanno) self.ui.comboBox_indvDetXLabel.clear() self.ui.comboBox_indvDetXLabel.addItems(floatsamplelognamelist) + # get data + vecx, vecy = self._myControl.getIndividualDetCounts(expno, scanno, detid, xlabel) + + # plot to canvas + canvas = self.ui.graphicsView_indvDet + marker, color = canvas.getNextLineMarkerColorCombo() + if xlabel is None: + xlabel = r'2\theta' + + label = "Detector ID: %d" % (detid) + canvas.addPlot(vecx, vecy, marker=marker, color=color, xlabel=xlabel, \ + ylabel='Counts',label=label) + + # auto setup for image boundary + xmin = min(vecx) + xmax = max(vecx) + + ymax = max(vecy) + ymin = min(vecy) + + dx = xmax-xmin + dy = ymax-ymin + canvas.setXYLimit(xmin-dx*0.1, xmax+dx*0.1, ymin-dy*0.1, ymax+dy*0.1) + + return True + def _plotRawDetSignal(self, expno, scanno, plotmode, ptno, dooverplot): @@ -1047,7 +1110,7 @@ def _plotRawDetSignal(self, expno, scanno, plotmode, ptno, dooverplot): elif plotmode == "Single Pts.": # Plot plot - if dooverplot is True: + if dooverplot is False: self.ui.graphicsView_Raw.clearAllLines() self.ui.graphicsView_Raw.setLineMarkerColorIndex(0) @@ -1060,7 +1123,8 @@ def _plotRawDetSignal(self, expno, scanno, plotmode, ptno, dooverplot): # plot canvas = self.ui.graphicsView_Raw - unit = '$2\theta$' + # FIXME + unit = r"$2\theta$" # plot xmin = 1.E10 @@ -1095,7 +1159,7 @@ def _plotRawDetSignal(self, expno, scanno, plotmode, ptno, dooverplot): dy = ymax-ymin canvas.setXYLimit(xmin-dx*0.1, xmax+dx*0.1, ymin-dy*0.1, ymax+dy*0.1) - return + return True def _plotMergedReducedData(self, mkey, label): @@ -1242,9 +1306,9 @@ def _uiGetBinningParams(self, xmin_w=None, binsize_w=None, xmax_w=None): xmax = str(self.ui.lineEdit_xmax.text()) binsize = str(self.ui.lineEdit_binsize.text()) else: - xmin = str(xmin_w) - xmax = str(xmax_w) - binsize = str(binsize_w) + xmin = str(xmin_w.text()) + xmax = str(xmax_w.text()) + binsize = str(binsize_w.text()) # set data try: @@ -1257,11 +1321,11 @@ def _uiGetBinningParams(self, xmin_w=None, binsize_w=None, xmax_w=None): if xmin >= xmax: raise NotImplementedError("set minimum X = %.5f is larger than \ maximum X = %.5f" % (xmin, xmax)) - + try: binsize = float(binsize) except ValueError as e: - raise NotImplementedError("Error bins size cannot be left blank.") + raise NotImplementedError("Error: bins size '%s' is not a float number." % (binsize)) return (xmin, binsize, xmax) diff --git a/Code/Mantid/scripts/HFIRPowderReduction/README.md b/Code/Mantid/scripts/HFIRPowderReduction/README.md index a1d6bf97fa3e..05e651776853 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/README.md +++ b/Code/Mantid/scripts/HFIRPowderReduction/README.md @@ -1,6 +1,3 @@ - - - Use cases for tabs: 1. **Raw Detectors**: Visualize the reading of detectors directly coming out of the raw data @@ -20,5 +17,21 @@ Use cases for tabs: * Reduce a set of scans and plot in 2D/water-fall mode; * Able to merge all the scans; * New from Mantid: *ConvertCWPDMDToSpectra(ExcludedDetectors=[])* - 5. **Advanced Setup** + 5. **Vanadium**: strip vanadium peaks + * Strip vanadium peak with unit 'Degrees' because of the binning (range and step size) must be respected; + * Peaks' position should be calculated and indicated auotmatically; + * *Mantid::StripPeaks()* will be called instread of *StripVadadiumPeaks()* because + the later one only works in d-spacing; + 6. **Advanced Setup** * URL for raw data files; + + + +Tasks: + + 1. Make tab *Raw Detector* work; + 2. Make tab *Individual Detector* work; + 3. Find out why the vanadium runs (379-10/11) look funny, i.e., oscilating curves; + 4. Implement automatic wavelength mapping; + 5. Implement tab *vanadium*; + 6. Talk with Clarina how to deal with vanadium spectrum with peaks striped; diff --git a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py index 661dab3eea94..2bd9ebd572cd 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'Ui_MainWindow.ui' # -# Created: Tue Apr 7 11:32:18 2015 +# Created: Fri Apr 10 17:21:29 2015 # by: PyQt4 UI code generator 4.11.2 # # WARNING! All changes made in this file will be lost! @@ -182,6 +182,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_17.setObjectName(_fromUtf8("horizontalLayout_17")) self.horizontalLayout_23 = QtGui.QHBoxLayout() self.horizontalLayout_23.setObjectName(_fromUtf8("horizontalLayout_23")) + self.verticalLayout_13 = QtGui.QVBoxLayout() + self.verticalLayout_13.setObjectName(_fromUtf8("verticalLayout_13")) self.graphicsView_indvDet = Qt4MplPlotView(self.tab_5) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding) sizePolicy.setHorizontalStretch(0) @@ -189,33 +191,50 @@ def setupUi(self, MainWindow): sizePolicy.setHeightForWidth(self.graphicsView_indvDet.sizePolicy().hasHeightForWidth()) self.graphicsView_indvDet.setSizePolicy(sizePolicy) self.graphicsView_indvDet.setObjectName(_fromUtf8("graphicsView_indvDet")) - self.horizontalLayout_23.addWidget(self.graphicsView_indvDet) + self.verticalLayout_13.addWidget(self.graphicsView_indvDet) + self.comboBox_indvDetXLabel = QtGui.QComboBox(self.tab_5) + self.comboBox_indvDetXLabel.setObjectName(_fromUtf8("comboBox_indvDetXLabel")) + self.verticalLayout_13.addWidget(self.comboBox_indvDetXLabel) + self.horizontalLayout_23.addLayout(self.verticalLayout_13) self.verticalLayout_12 = QtGui.QVBoxLayout() self.verticalLayout_12.setObjectName(_fromUtf8("verticalLayout_12")) self.pushButton_plotIndvDet = QtGui.QPushButton(self.tab_5) self.pushButton_plotIndvDet.setObjectName(_fromUtf8("pushButton_plotIndvDet")) self.verticalLayout_12.addWidget(self.pushButton_plotIndvDet) - spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.checkBox_overPlotIndvDet = QtGui.QCheckBox(self.tab_5) + self.checkBox_overPlotIndvDet.setObjectName(_fromUtf8("checkBox_overPlotIndvDet")) + self.verticalLayout_12.addWidget(self.checkBox_overPlotIndvDet) + spacerItem5 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) self.verticalLayout_12.addItem(spacerItem5) + self.pushButton_plotAllDet = QtGui.QPushButton(self.tab_5) + self.pushButton_plotAllDet.setObjectName(_fromUtf8("pushButton_plotAllDet")) + self.verticalLayout_12.addWidget(self.pushButton_plotAllDet) + spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Minimum) + self.verticalLayout_12.addItem(spacerItem6) self.pushButton_plotPrevDet = QtGui.QPushButton(self.tab_5) self.pushButton_plotPrevDet.setObjectName(_fromUtf8("pushButton_plotPrevDet")) self.verticalLayout_12.addWidget(self.pushButton_plotPrevDet) self.pushButton_plotNextDet = QtGui.QPushButton(self.tab_5) self.pushButton_plotNextDet.setObjectName(_fromUtf8("pushButton_plotNextDet")) self.verticalLayout_12.addWidget(self.pushButton_plotNextDet) - spacerItem6 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_12.addItem(spacerItem6) + spacerItem7 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem7) + self.pushButton_clearCanvasIndDet = QtGui.QPushButton(self.tab_5) + self.pushButton_clearCanvasIndDet.setObjectName(_fromUtf8("pushButton_clearCanvasIndDet")) + self.verticalLayout_12.addWidget(self.pushButton_clearCanvasIndDet) + spacerItem8 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem8) + self.comboBox_indvDetYLabel = QtGui.QComboBox(self.tab_5) + self.comboBox_indvDetYLabel.setObjectName(_fromUtf8("comboBox_indvDetYLabel")) + self.verticalLayout_12.addWidget(self.comboBox_indvDetYLabel) + self.pushButton_plotLog = QtGui.QPushButton(self.tab_5) + self.pushButton_plotLog.setObjectName(_fromUtf8("pushButton_plotLog")) + self.verticalLayout_12.addWidget(self.pushButton_plotLog) + spacerItem9 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_12.addItem(spacerItem9) self.horizontalLayout_23.addLayout(self.verticalLayout_12) self.horizontalLayout_17.addLayout(self.horizontalLayout_23) self.verticalLayout_8.addLayout(self.horizontalLayout_17) - self.verticalLayout_10 = QtGui.QVBoxLayout() - self.verticalLayout_10.setObjectName(_fromUtf8("verticalLayout_10")) - self.comboBox_indvDetXLabel = QtGui.QComboBox(self.tab_5) - self.comboBox_indvDetXLabel.setObjectName(_fromUtf8("comboBox_indvDetXLabel")) - self.comboBox_indvDetXLabel.addItem(_fromUtf8("")) - self.comboBox_indvDetXLabel.addItem(_fromUtf8("")) - self.verticalLayout_10.addWidget(self.comboBox_indvDetXLabel) - self.verticalLayout_8.addLayout(self.verticalLayout_10) self.gridLayout_7.addLayout(self.verticalLayout_8, 0, 0, 1, 1) self.tabWidget.addTab(self.tab_5, _fromUtf8("")) self.tab = QtGui.QWidget() @@ -244,13 +263,13 @@ def setupUi(self, MainWindow): self.lineEdit_normalizeMonitor.setMinimumSize(QtCore.QSize(300, 0)) self.lineEdit_normalizeMonitor.setObjectName(_fromUtf8("lineEdit_normalizeMonitor")) self.horizontalLayout_3.addWidget(self.lineEdit_normalizeMonitor) - spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_3.addItem(spacerItem7) + spacerItem10 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_3.addItem(spacerItem10) self.checkBox_clearPrevious = QtGui.QCheckBox(self.tab) self.checkBox_clearPrevious.setObjectName(_fromUtf8("checkBox_clearPrevious")) self.horizontalLayout_3.addWidget(self.checkBox_clearPrevious) - spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_3.addItem(spacerItem8) + spacerItem11 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_3.addItem(spacerItem11) self.verticalLayout_2.addLayout(self.horizontalLayout_3) self.horizontalLayout_6 = QtGui.QHBoxLayout() self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6")) @@ -275,8 +294,8 @@ def setupUi(self, MainWindow): self.comboBox_effCorrect = QtGui.QComboBox(self.tab) self.comboBox_effCorrect.setObjectName(_fromUtf8("comboBox_effCorrect")) self.horizontalLayout_6.addWidget(self.comboBox_effCorrect) - spacerItem9 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_6.addItem(spacerItem9) + spacerItem12 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_6.addItem(spacerItem12) self.verticalLayout_2.addLayout(self.horizontalLayout_6) self.horizontalLayout_22 = QtGui.QHBoxLayout() self.horizontalLayout_22.setObjectName(_fromUtf8("horizontalLayout_22")) @@ -292,8 +311,8 @@ def setupUi(self, MainWindow): self.pushButton_saveData = QtGui.QPushButton(self.tab) self.pushButton_saveData.setObjectName(_fromUtf8("pushButton_saveData")) self.horizontalLayout_22.addWidget(self.pushButton_saveData) - spacerItem10 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_22.addItem(spacerItem10) + spacerItem13 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_22.addItem(spacerItem13) self.verticalLayout_2.addLayout(self.horizontalLayout_22) self.horizontalLayout_5 = QtGui.QHBoxLayout() self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5")) @@ -316,8 +335,8 @@ def setupUi(self, MainWindow): self.pushButton_nextScan = QtGui.QPushButton(self.tab) self.pushButton_nextScan.setObjectName(_fromUtf8("pushButton_nextScan")) self.verticalLayout_3.addWidget(self.pushButton_nextScan) - spacerItem11 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) - self.verticalLayout_3.addItem(spacerItem11) + spacerItem14 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.verticalLayout_3.addItem(spacerItem14) self.label_xmin = QtGui.QLabel(self.tab) sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Fixed) sizePolicy.setHorizontalStretch(0) @@ -367,8 +386,8 @@ def setupUi(self, MainWindow): self.lineEdit_binsize.setSizePolicy(sizePolicy) self.lineEdit_binsize.setObjectName(_fromUtf8("lineEdit_binsize")) self.verticalLayout_3.addWidget(self.lineEdit_binsize) - spacerItem12 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) - self.verticalLayout_3.addItem(spacerItem12) + spacerItem15 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.verticalLayout_3.addItem(spacerItem15) self.pushButton_unit2theta = QtGui.QPushButton(self.tab) self.pushButton_unit2theta.setObjectName(_fromUtf8("pushButton_unit2theta")) self.verticalLayout_3.addWidget(self.pushButton_unit2theta) @@ -378,8 +397,8 @@ def setupUi(self, MainWindow): self.pushButton_unitQ = QtGui.QPushButton(self.tab) self.pushButton_unitQ.setObjectName(_fromUtf8("pushButton_unitQ")) self.verticalLayout_3.addWidget(self.pushButton_unitQ) - spacerItem13 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_3.addItem(spacerItem13) + spacerItem16 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_3.addItem(spacerItem16) self.horizontalLayout_5.addLayout(self.verticalLayout_3) self.verticalLayout_2.addLayout(self.horizontalLayout_5) self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 1, 1) @@ -429,8 +448,8 @@ def setupUi(self, MainWindow): self.pushButton = QtGui.QPushButton(self.tab_merge) self.pushButton.setObjectName(_fromUtf8("pushButton")) self.horizontalLayout_19.addWidget(self.pushButton) - spacerItem14 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_19.addItem(spacerItem14) + spacerItem17 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_19.addItem(spacerItem17) self.verticalLayout_merge.addLayout(self.horizontalLayout_19) self.horizontalLayout_18 = QtGui.QHBoxLayout() self.horizontalLayout_18.setObjectName(_fromUtf8("horizontalLayout_18")) @@ -471,16 +490,16 @@ def setupUi(self, MainWindow): self.horizontalLayout_16.addLayout(self.verticalLayout_mergeView) self.verticalLayout_11 = QtGui.QVBoxLayout() self.verticalLayout_11.setObjectName(_fromUtf8("verticalLayout_11")) - spacerItem15 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) - self.verticalLayout_11.addItem(spacerItem15) + spacerItem18 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.verticalLayout_11.addItem(spacerItem18) self.pushButton_view2D = QtGui.QPushButton(self.tab_merge) self.pushButton_view2D.setObjectName(_fromUtf8("pushButton_view2D")) self.verticalLayout_11.addWidget(self.pushButton_view2D) self.pushButton_saveMerge = QtGui.QPushButton(self.tab_merge) self.pushButton_saveMerge.setObjectName(_fromUtf8("pushButton_saveMerge")) self.verticalLayout_11.addWidget(self.pushButton_saveMerge) - spacerItem16 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_11.addItem(spacerItem16) + spacerItem19 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_11.addItem(spacerItem19) self.pushButton_mergeScans = QtGui.QPushButton(self.tab_merge) self.pushButton_mergeScans.setObjectName(_fromUtf8("pushButton_mergeScans")) self.verticalLayout_11.addWidget(self.pushButton_mergeScans) @@ -490,8 +509,8 @@ def setupUi(self, MainWindow): self.pushButton_2 = QtGui.QPushButton(self.tab_merge) self.pushButton_2.setObjectName(_fromUtf8("pushButton_2")) self.verticalLayout_11.addWidget(self.pushButton_2) - spacerItem17 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_11.addItem(spacerItem17) + spacerItem20 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_11.addItem(spacerItem20) self.horizontalLayout_16.addLayout(self.verticalLayout_11) self.verticalLayout_merge.addLayout(self.horizontalLayout_16) self.horizontalLayout_20 = QtGui.QHBoxLayout() @@ -528,8 +547,8 @@ def setupUi(self, MainWindow): self.lineEdit_stripVPeaks.setEnabled(False) self.lineEdit_stripVPeaks.setObjectName(_fromUtf8("lineEdit_stripVPeaks")) self.horizontalLayout_15.addWidget(self.lineEdit_stripVPeaks) - spacerItem18 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_15.addItem(spacerItem18) + spacerItem21 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_15.addItem(spacerItem21) self.pushButton_resetVanPeakList = QtGui.QPushButton(self.tab_4) self.pushButton_resetVanPeakList.setObjectName(_fromUtf8("pushButton_resetVanPeakList")) self.horizontalLayout_15.addWidget(self.pushButton_resetVanPeakList) @@ -546,8 +565,8 @@ def setupUi(self, MainWindow): self.horizontalLayout_11.addWidget(self.graphicsView_vanPeaks) self.verticalLayout_6 = QtGui.QVBoxLayout() self.verticalLayout_6.setObjectName(_fromUtf8("verticalLayout_6")) - spacerItem19 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) - self.verticalLayout_6.addItem(spacerItem19) + spacerItem22 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.verticalLayout_6.addItem(spacerItem22) self.label_3 = QtGui.QLabel(self.tab_4) self.label_3.setObjectName(_fromUtf8("label_3")) self.verticalLayout_6.addWidget(self.label_3) @@ -589,16 +608,16 @@ def setupUi(self, MainWindow): self.pushButton_rebinD = QtGui.QPushButton(self.tab_4) self.pushButton_rebinD.setObjectName(_fromUtf8("pushButton_rebinD")) self.verticalLayout_6.addWidget(self.pushButton_rebinD) - spacerItem20 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) - self.verticalLayout_6.addItem(spacerItem20) + spacerItem23 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.verticalLayout_6.addItem(spacerItem23) self.pushButton_stripVanPeaks = QtGui.QPushButton(self.tab_4) self.pushButton_stripVanPeaks.setObjectName(_fromUtf8("pushButton_stripVanPeaks")) self.verticalLayout_6.addWidget(self.pushButton_stripVanPeaks) self.pushButton_saveVanRun = QtGui.QPushButton(self.tab_4) self.pushButton_saveVanRun.setObjectName(_fromUtf8("pushButton_saveVanRun")) self.verticalLayout_6.addWidget(self.pushButton_saveVanRun) - spacerItem21 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.verticalLayout_6.addItem(spacerItem21) + spacerItem24 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.verticalLayout_6.addItem(spacerItem24) self.horizontalLayout_11.addLayout(self.verticalLayout_6) self.verticalLayout_5.addLayout(self.horizontalLayout_11) self.gridLayout_5.addLayout(self.verticalLayout_5, 0, 0, 1, 1) @@ -624,11 +643,11 @@ def setupUi(self, MainWindow): self.comboBox_instrument.setObjectName(_fromUtf8("comboBox_instrument")) self.comboBox_instrument.addItem(_fromUtf8("")) self.horizontalLayout_10.addWidget(self.comboBox_instrument) - spacerItem22 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_10.addItem(spacerItem22) + spacerItem25 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_10.addItem(spacerItem25) self.verticalLayout_4.addLayout(self.horizontalLayout_10) - spacerItem23 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) - self.verticalLayout_4.addItem(spacerItem23) + spacerItem26 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.verticalLayout_4.addItem(spacerItem26) self.horizontalLayout_7 = QtGui.QHBoxLayout() self.horizontalLayout_7.setObjectName(_fromUtf8("horizontalLayout_7")) self.label_cache = QtGui.QLabel(self.tab_2) @@ -655,8 +674,8 @@ def setupUi(self, MainWindow): self.checkBox_delCache = QtGui.QCheckBox(self.tab_2) self.checkBox_delCache.setObjectName(_fromUtf8("checkBox_delCache")) self.horizontalLayout_7.addWidget(self.checkBox_delCache) - spacerItem24 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_7.addItem(spacerItem24) + spacerItem27 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem27) self.verticalLayout_4.addLayout(self.horizontalLayout_7) self.horizontalLayout_8 = QtGui.QHBoxLayout() self.horizontalLayout_8.setObjectName(_fromUtf8("horizontalLayout_8")) @@ -691,8 +710,8 @@ def setupUi(self, MainWindow): self.pushButton_chkServer = QtGui.QPushButton(self.tab_2) self.pushButton_chkServer.setObjectName(_fromUtf8("pushButton_chkServer")) self.horizontalLayout_8.addWidget(self.pushButton_chkServer) - spacerItem25 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_8.addItem(spacerItem25) + spacerItem28 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_8.addItem(spacerItem28) self.verticalLayout_4.addLayout(self.horizontalLayout_8) self.horizontalLayout_9 = QtGui.QHBoxLayout() self.horizontalLayout_9.setObjectName(_fromUtf8("horizontalLayout_9")) @@ -727,15 +746,15 @@ def setupUi(self, MainWindow): self.pushButton_browseLocalSrc = QtGui.QPushButton(self.tab_2) self.pushButton_browseLocalSrc.setObjectName(_fromUtf8("pushButton_browseLocalSrc")) self.horizontalLayout_9.addWidget(self.pushButton_browseLocalSrc) - spacerItem26 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) - self.horizontalLayout_9.addItem(spacerItem26) + spacerItem29 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_9.addItem(spacerItem29) self.verticalLayout_4.addLayout(self.horizontalLayout_9) self.horizontalLayout_4 = QtGui.QHBoxLayout() self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) self.verticalLayout_4.addLayout(self.horizontalLayout_4) self.gridLayout_3.addLayout(self.verticalLayout_4, 0, 0, 1, 1) - spacerItem27 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) - self.gridLayout_3.addItem(spacerItem27, 1, 0, 1, 1) + spacerItem30 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Expanding) + self.gridLayout_3.addItem(spacerItem30, 1, 0, 1, 1) self.tabWidget.addTab(self.tab_2, _fromUtf8("")) self.horizontalLayout_2.addWidget(self.tabWidget) self.verticalLayout.addLayout(self.horizontalLayout_2) @@ -809,10 +828,12 @@ def retranslateUi(self, MainWindow): self.label_11.setText(_translate("MainWindow", "Detector ID", None)) self.label_17.setText(_translate("MainWindow", "Detector IDs From 1 to 44", None)) self.pushButton_plotIndvDet.setText(_translate("MainWindow", "Plot", None)) + self.checkBox_overPlotIndvDet.setText(_translate("MainWindow", "Over Plot Previous", None)) + self.pushButton_plotAllDet.setText(_translate("MainWindow", "Plot All ", None)) self.pushButton_plotPrevDet.setText(_translate("MainWindow", "Previous Detector", None)) self.pushButton_plotNextDet.setText(_translate("MainWindow", "Next Detector", None)) - self.comboBox_indvDetXLabel.setItemText(0, _translate("MainWindow", "Pt.", None)) - self.comboBox_indvDetXLabel.setItemText(1, _translate("MainWindow", "$2\\theta$", None)) + self.pushButton_clearCanvasIndDet.setText(_translate("MainWindow", "Clear", None)) + self.pushButton_plotLog.setText(_translate("MainWindow", "Plot Sample Log", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_5), _translate("MainWindow", "Individual Detector", None)) self.label_normalizeMonitor.setText(_translate("MainWindow", "Normalization Monitor", None)) self.checkBox_clearPrevious.setText(_translate("MainWindow", "Clear Previous Plot", None)) diff --git a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui index c0ad9905770d..cc48fffb6f72 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui +++ b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui @@ -344,13 +344,7 @@ - - - - Pt. - - - + @@ -363,11 +357,44 @@ + + + + Over Plot Previous + + + + + + + Qt::Vertical + + + QSizePolicy::Minimum + + + + 20 + 40 + + + + + + + + Plot All + + + Qt::Vertical + + QSizePolicy::Minimum + 20 @@ -390,6 +417,26 @@ + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + Clear + + + diff --git a/Code/Mantid/scripts/HFIRPowderReduction/testGUI_IndvDet.py b/Code/Mantid/scripts/HFIRPowderReduction/testGUI_IndvDet.py index 70f8a9f0679e..4353d5c7337c 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/testGUI_IndvDet.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/testGUI_IndvDet.py @@ -50,6 +50,7 @@ def qapp(): reducer.ui.lineEdit_expNo.setText('231') reducer.ui.lineEdit_scanNo.setText('1') reducer.ui.lineEdit_detID.setText('21') +reducer.ui.tabWidget.setCurrentIndex(1) if MOS == LINUX: reducer.ui.lineEdit_cache.setText('/home/wzz/Temp/') @@ -57,6 +58,7 @@ def qapp(): reducer.ui.lineEdit_cache.setText('/Users/wzz/Temp/') # plot raw +reducer.doLoadData() reducer.doPlotIndvDet() app.exec_() diff --git a/Code/Mantid/scripts/HFIRPowderReduction/testGUI_RawDetect.py b/Code/Mantid/scripts/HFIRPowderReduction/testGUI_RawDetect.py index 67eb50040ed2..6c7f4a80aecc 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/testGUI_RawDetect.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/testGUI_RawDetect.py @@ -70,8 +70,8 @@ def qapp(): reducer.ui.lineEdit_expNo.setText('231') reducer.ui.lineEdit_scanNo.setText('1') -# this should be automatically setup -# reducer.ui.lineEdit_wavelength.setText('2.41') +reducer.ui.comboBox_rawDetMode.setCurrentIndex(1) +reducer.ui.lineEdit_ptNo.setText('21') if MOS == LINUX: reducer.ui.lineEdit_cache.setText('/home/wzz/Temp/') @@ -79,10 +79,13 @@ def qapp(): reducer.ui.lineEdit_cache.setText('/Users/wzz/Temp/') # plot raw +reducer.ui.tabWidget.setCurrentIndex(0) reducer.doPlotRawDet() -# load and reduce data -reducer.doLoadData() +# FIXME - Phase 2nd +reducer.ui.comboBox_rawDetMode.setCurrentIndex(1) +reducer.ui.lineEdit_ptNo.setText('21') + app.exec_() diff --git a/Code/Mantid/scripts/HFIRPowderReduction/testGUI_vanadiumPeak.py b/Code/Mantid/scripts/HFIRPowderReduction/testGUI_vanadiumPeak.py index 425d0f59a8c6..6c0b669cb4bc 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/testGUI_vanadiumPeak.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/testGUI_vanadiumPeak.py @@ -59,9 +59,9 @@ def qapp(): reducer.ui.lineEdit_cache.setText('/Users/wzz/Temp/') # example: 'http://neutron.ornl.gov/user_data/hb2a/exp400/Datafiles/HB2A_exp0400_scan0001.dat' -print "Set to exp 231, scan 1" -reducer.ui.lineEdit_expNo.setText('231') -reducer.ui.lineEdit_scanNo.setText('1') +print "Set to exp 457, scan 10" +reducer.ui.lineEdit_expNo.setText('379') +reducer.ui.lineEdit_scanNo.setText('10') reducer.ui.lineEdit_wavelength.setText('2.41') reducer.ui.lineEdit_minD.setText('1.0') @@ -73,8 +73,14 @@ def qapp(): # load and reduce data reducer.doLoadData() + +# rebin +reducer.ui.lineEdit_binsizeD.setText('0.001') +reducer.doRebinD() +""" reducer.doStripVandiumPeaks() reducer.doSaveVanRun() +""" # Skip if there is something wrong reducer.show()