diff --git a/addie/addiedriver.py b/addie/addiedriver.py index 36174488..bdbd55c5 100644 --- a/addie/addiedriver.py +++ b/addie/addiedriver.py @@ -26,23 +26,48 @@ def __init__(self): self._grWsIndex = 0 self._grWsNameDict = dict() - def calculate_sqAlt(self, ws_name, outputType): + def calculate_sqAlt(self, ws_name, initType, outputType): + if initType == "S(Q)": + pass # don't do anything + elif initType == "S(Q)-1": + x_tmp = simpleapi.mtd[ws_name].readX(0) + y_tmp = simpleapi.mtd[ws_name].readY(0) + 1.0 + simpleapi.CreateWorkspace(DataX=x_tmp, + DataY=y_tmp, + NSpec=1, + UnitX="MomentumTransfer", + OutputWorkspace=ws_name) + elif initType == "Q[S(Q)-1]": + simpleapi.PDConvertReciprocalSpace( + InputWorkspace=ws_name, + OutputWorkspace=ws_name, + From='F(Q)', + To='S(Q)') + if outputType == 'S(Q)': # don't do anything return ws_name elif outputType == 'Q[S(Q)-1]': outputType = 'F(Q)' else: - # PDConvertReciprocalSpace doesn't currently know how to convert to - # S(Q)-1 - raise ValueError( - 'Do not know how to convert to {}'.format(outputType)) + outputType = 'S(Q)-1' outputName = '__{}Alt'.format(ws_name) # should be hidden - simpleapi.PDConvertReciprocalSpace( - InputWorkspace=ws_name, - OutputWorkspace=outputName, - From='S(Q)', - To=outputType) + + if outputType != 'S(Q)-1': + simpleapi.PDConvertReciprocalSpace( + InputWorkspace=ws_name, + OutputWorkspace=outputName, + From='S(Q)', + To=outputType) + else: + x_tmp = simpleapi.mtd[ws_name].readX(0) + y_tmp = simpleapi.mtd[ws_name].readY(0) - 1.0 + simpleapi.CreateWorkspace(DataX=x_tmp, + DataY=y_tmp, + NSpec=1, + UnitX="MomentumTransfer", + OutputWorkspace=outputName) + return outputName def calculate_gr( @@ -464,7 +489,7 @@ def save_ascii(self, ws_name, file_name, filetype, comment=''): Args: ws_name: file_name: - filetype: xye, csv, rmcprofile, dat + filetype: xye, csv, rmcprofile, dat, gr, gofr comment: user comment to the file Returns: @@ -473,7 +498,7 @@ def save_ascii(self, ws_name, file_name, filetype, comment=''): assert isinstance( filetype, str), 'GofR file type {0} must be a supported string.'.format(filetype) - if filetype == 'xye' or filetype == 'gr': + if filetype == 'xye' or filetype == 'gr' or filetype == 'gofr': x_val = simpleapi.mtd[ws_name].readX(0)[:-1] y_val = simpleapi.mtd[ws_name].readY(0) e_val = simpleapi.mtd[ws_name].readE(0) diff --git a/addie/calculate_gr/event_handler.py b/addie/calculate_gr/event_handler.py index 4b314180..9b1037a2 100644 --- a/addie/calculate_gr/event_handler.py +++ b/addie/calculate_gr/event_handler.py @@ -46,7 +46,6 @@ def gr_widgets_status(main_window, gr_status): list_gr_ui = [main_window.calculategr_ui.pushButton_saveGR, main_window.calculategr_ui.pushButton_rescaleGr, main_window.calculategr_ui.pushButton_grColorStyle, - main_window.calculategr_ui.pushButton_generateSQ, main_window.calculategr_ui.pushButton_clearGrCanvas] for _ui in list_gr_ui: @@ -135,7 +134,8 @@ def plot_sq(main_window, ws_name, color, clear_prev): # convert to the function to plot sq_type = str(main_window.calculategr_ui.comboBox_SofQType.currentText()) plottable_name = main_window._myController.calculate_sqAlt( - ws_name, sq_type) + ws_name, main_window.sofq_type_in_mem, sq_type) + main_window.sofq_type_in_mem = sq_type main_window.calculategr_ui.graphicsView_sq.plot_sq( plottable_name, @@ -152,7 +152,7 @@ def generate_gr_step1(main_window): # get S(Q) workspace gr_list = main_window.calculategr_ui.treeWidget_grWsList sq_name_list = gr_list.get_selected_items_of_level( - 2, excluded_parent='GofR', return_item_text=True) + 2, excluded_parent='G(R)', return_item_text=True) if len(sq_name_list) == 0: comboBox_SofQ = main_window.calculategr_ui.comboBox_SofQ selected_sq = str(comboBox_SofQ.currentText()) @@ -507,7 +507,8 @@ def do_save_gr(main_window): FILE_FILTERS = {'PDFgui (*.gr)': 'gr', 'XYE (*.xye)': 'xye', 'CSV XYE (*.csv)': 'csv', - 'RMCProfile (*.dat)': 'dat'} + 'RMCProfile (*.dat)': 'dat', + 'g(r) (*.gofr)': 'gofr'} filename, filetype = get_save_file( parent=main_window, @@ -521,7 +522,13 @@ def do_save_gr(main_window): filetype = 'rmcprofile' # save! - main_window._myController.save_ascii(gr_ws_name, filename, filetype) + try: + main_window._myController.save_ascii(gr_ws_name, filename, filetype) + except RuntimeError as err: + main_window.ui.statusbar.setStyleSheet("color: red") + main_window.ui.statusbar.showMessage(err, + main_window.statusbar_display_time) + main_window.ui.statusbar.setStyleSheet("color: blue") main_window.ui.statusbar.showMessage("File successfully saved.", main_window.statusbar_display_time) @@ -536,7 +543,8 @@ def do_save_gr(main_window): "gr": "gr", "csv": "csv", "rmcprofile": "dat", - "dat": "dat" + "dat": "dat", + "gofr": "gofr" } if "xye" in out_dir.lower(): filetype = "xye" @@ -548,6 +556,8 @@ def do_save_gr(main_window): filetype = "rmcprofile" elif "dat" in out_dir.lower(): filetype = "dat" + elif "gofr" in out_dir.lower(): + filetype = "gofr" else: filetype = "gr" @@ -623,29 +633,6 @@ def do_edit_sq(main_window): main_window._editSqDialog.show() -def do_generate_sq(main_window): - """ - generate S(Q) from G(r) by PDFFourierTransform - """ - # TODO/ISSUE/NOW - Need to implement! - raise NotImplementedError( - 'Dialog box for generating S(Q) has not been implemented yet.') - # get setup - min_r = float(main_window.calculategr_ui.doubleSpinBoxRmin.value()) - max_r = float(main_window.calculategr_ui.doubleSpinBoxRmax.value()) - min_q = main_window.calculategr_ui.doubleSpinBoxQmin.value() - max_q = main_window.calculategr_ui.doubleSpinBoxQmax.value() - - # launch the dialog bo - if main_window._generateSofQDialog is None: - main_window._generateSofQDialog = None - - main_window._generateSofQDialog.set_r_range(min_r, max_r) - main_window._generateSofQDialog.set_q_range(min_q, max_q) - - main_window._generateSofQDialog.show() - - def _set_color_marker(main_window, graphicsView): plot_id_label_list = graphicsView.get_current_plots() diff --git a/addie/initialization/events/calculategr_tab.py b/addie/initialization/events/calculategr_tab.py index b234c9bd..161a6b08 100644 --- a/addie/initialization/events/calculategr_tab.py +++ b/addie/initialization/events/calculategr_tab.py @@ -11,7 +11,6 @@ def run(main_window=None): main_window.calculategr_ui.pushButton_clearGrCanvas.clicked.connect(main_window.do_clear_gr) main_window.calculategr_ui.pushButton_saveSQ.clicked.connect(main_window.do_save_sq) main_window.calculategr_ui.pushButton_editSofQ.clicked.connect(main_window.do_edit_sq) - main_window.calculategr_ui.pushButton_generateSQ.clicked.connect(main_window.do_generate_sq) main_window.calculategr_ui.doubleSpinBoxQmin.valueChanged.connect(main_window.evt_qmin_changed) main_window.calculategr_ui.doubleSpinBoxQmax.valueChanged.connect(main_window.evt_qmax_changed) diff --git a/addie/main.py b/addie/main.py index 7ac1dc39..c1b141ca 100644 --- a/addie/main.py +++ b/addie/main.py @@ -292,6 +292,8 @@ class MainWindow(QMainWindow): idl_modes = ("idl", "idl_dev") + sofq_type_in_mem = "S(Q)" + def __init__(self, parent=None, processing_mode=None): """ Initialization Parameters @@ -845,9 +847,6 @@ def do_save_sq(self): def do_edit_sq(self): calculategr_event_handler.do_edit_sq(self) - def do_generate_sq(self): - calculategr_event_handler.do_generate_sq(self) - def do_set_gofr_color_marker(self): calculategr_event_handler.do_set_gofr_color_marker(self) diff --git a/addie/ui/old_mainWindow.ui b/addie/ui/old_mainWindow.ui deleted file mode 100644 index 9c941477..00000000 --- a/addie/ui/old_mainWindow.ui +++ /dev/null @@ -1,6509 +0,0 @@ - - - MainWindow - - - - 0 - 0 - 1711 - 1007 - - - - - 0 - 0 - - - - - 0 - 0 - - - - MainWindow - - - - - 0 - 0 - - - - - - - - 800 - 0 - - - - - 16777215 - 16777215 - - - - Qt::ScrollBarAsNeeded - - - true - - - - - 0 - 0 - 1691 - 943 - - - - - 0 - 0 - - - - - - - Qt::Vertical - - - - - - - - 500 - 0 - - - - 3 - - - - autoNOM - - - - - - - 0 - 0 - - - - Scan Numbers (ex: 1234, 1300-1305, 1310) - - - - - - - - - 189 - 0 - - - - - 160 - 16777215 - - - - Select Working Folder ... - - - - - - - - 500 - 0 - - - - - 500 - 16777215 - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Calibration - - - - - - - Container - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Normalization - - - - - - - Normalization Background - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Calibration Background - - - - - - - - - - - - Qt::Horizontal - - - - - - - - - - - - - First scan to be analyzed - - - - - - - Frequency (Hz) - - - - - - - Last scan to be analyzed - - - - - - - - - - - - - - - - - - - - - - 60 - - - - - 30 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 120 - 0 - - - - Recalibration - - - - - - yes - - - - - - - No - - - true - - - - - - - - - - - 120 - 0 - - - - Renormalization - - - - - - Yes - - - - - - - No - - - true - - - - - - - - - - - 120 - 0 - - - - Autotemplate - - - - - - Yes - - - true - - - - - - - No - - - false - - - - - - - - - - Live - - - - - - Will overwrite the data reduction config file - - - Yes - - - - - - - Will not overwrite the data reduction config file - - - No - - - true - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Comments - - - - - - - - - - - - - - false - - - Sample Environment - - - - - - - false - - - - shifter - - - - - orange_cryostat - - - - - ILL_furnace - - - - - stick_furnace - - - - - aerodynamic_levitator - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 20 - - - - - - - - - - Create New autoNOM Folder? - - - true - - - - - - - Name of Output Folder - - - - - - Automatic (autoNOM_##) - - - true - - - - - - - - - Manual - - - - - - - false - - - - - - - false - - - Select ... - - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - false - - - - 200 - 0 - - - - - 200 - 16777215 - - - - Create exp.ini File Only - - - - - - - false - - - Run autoNOM script - - - - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - 255 - 0 - 0 - - - - - - - - - 128 - 128 - 128 - - - - - - - 128 - 128 - 128 - - - - - - - - ? - - - - - - - - - - Post Processing - - - - - - 0 - - - - - - - - 0 - 0 - - - - false - - - false - - - QFrame::NoFrame - - - 10 - - - 0 - - - Qt::Vertical - - - true - - - 15 - - - true - - - - - - - - - - 250 - 16777215 - - - - Move to Folder and Refresh Table ... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Name Search - - - - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - equil - - - - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - X - - - - - - - - - - - Import Table ... - - - - - - - false - - - Export Table ... - - - - - - - - 800 - 0 - - - - Reload List of Scans - - - - - - - - - - 800 - 0 - - - - Qt::CustomContextMenu - - - true - - - QAbstractItemView::SelectRows - - - false - - - false - - - true - - - false - - - true - - - false - - - - Select - - - - - Name - - - - - Runs - - - - - Sample Formula - - - - - Mass Density (g/cc) - - - - - Radius (cm) - - - - - Packing Fraction - - - - - Sample Shape - - - - - Do Abs. Corr. ? - - - - - - - - Sample formula example: H 2 O 1, 2H 2 O 1, 238U 1 O 2 - - - - - - - Background - - - - - - - - - 110 - 0 - - - - - 110 - 16777215 - - - - Default - - - true - - - - - - - - 300 - 0 - - - - N/A - - - - - - - - 110 - 16777215 - - - - (from exp.ini file) - - - - - - - - - - - - 110 - 0 - - - - - 110 - 16777215 - - - - Manual Select - - - - - - - false - - - - 0 - 0 - - - - - 250 - 0 - - - - - - - - - 0 - 0 - - - - N/A - - - - - - - - - - - - - 0 - - - - PDF - - - - - - - - Q range - - - - - - - 35 - 0 - - - - - 35 - 16777215 - - - - Qmin - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 0.2 - - - - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Qmax - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 31.4 - - - - - - - Reset - - - - - - - - - - Plazcek - - - - - - - - Type - - - - - - - hydrogen - - - false - - - - - - - no hydrogren - - - true - - - - - - - - - - - Fit Range - - - - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - 10 - - - - - - - , - - - - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - 50 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Poly. degree - - - - - - - 2 - - - 2 - - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - 0 - 0 - - - - Absolute Scale - - - - - - - - Fourier Filter - - - - - - 1.5 - - - - - - - , - - - - - - - 50 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - - 120 - 0 - - - - Muscat - - - - - - Yes - - - - - - - No - - - true - - - - - - - - - - - 120 - 0 - - - - Scale Data - - - - - - Yes - - - true - - - - - - - No - - - false - - - - - - - - - - - 120 - 0 - - - - Run RMC - - - - - - Yes - - - true - - - - - - - No - - - false - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Output File Name: - - - - - - - - 150 - 0 - - - - - 70 - 16777215 - - - - sample_name - - - false - - - - - - - .ndsum - - - - - - - Qt::Horizontal - - - QSizePolicy::Minimum - - - - 20 - 20 - - - - - - - - false - - - - 250 - 0 - - - - Run - - - - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 128 - 128 - 128 - - - - - - - - ? - - - - - - - - - - - - - 200 - 0 - - - - - 300 - 16777215 - - - - Sum Scans - - - - - - - - Qmax - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å<span style=" vertical-align:super;">-1</span></p></body></html> - - - - - - - - - (ex: 20, 30, 40) - - - - - - - - - Rmax - - - - - - - 50 - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å</p></body></html> - - - - - - - - - Test - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Output File Name - - - - - - - - - sum_ - - - - - - - sample_name - - - - - - - .inp - - - - - - - - - Interactive Mode ? - - - true - - - - - - - - - false - - - Run - - - - - - - - 20 - 16777215 - - - - - 20 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 128 - 128 - 128 - - - - - - - - ? - - - - - - - - - - - - - - - - - - - - - - - - - - 250 - 16777215 - - - - Move to Folder and Refresh Table ... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Name Search - - - - - - - - 200 - 0 - - - - - 200 - 16777215 - - - - equil - - - - - - - - 30 - 0 - - - - - 20 - 16777215 - - - - - - - - - - - - - - - Import Table ... - - - - - - - false - - - Export Table ... - - - - - - - - 800 - 0 - - - - Reload List of Scans - - - - - - - - - - 800 - 0 - - - - Qt::CustomContextMenu - - - true - - - QAbstractItemView::SelectRows - - - false - - - false - - - true - - - false - - - true - - - false - - - - Select - - - - - Name - - - - - Runs - - - - - Sample Formula - - - - - Mass Density (g/cc) - - - - - Radius (cm) - - - - - Height (cm) - - - - - Packing Fraction - - - - - Sample Shape - - - - - Abs. Corr. - - - - - Mult. Scat. Corr. - - - - - Inelastic Corr. - - - - - Input Grouping - - - - - Output Grouping - - - - - - - - Sample formula example: H 2 O 1, 2H 2 O 1, 238U 1 O 2 - - - - - - - Characterization - - - - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - Calibration: - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Browse ... - - - - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - or - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Make ... - - - - - - - N/A - - - - - - - - - Qt::Vertical - - - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - Instrument: - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Browse ... - - - - - - - - 100 - 0 - - - - N/A - - - - - - - - - - - - - - - Normalization: - - - - - - - false - - - - 0 - 0 - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - - - - - - 25 - 16777215 - - - - or - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Browse ... - - - - - - - - 0 - 0 - - - - - 100 - 0 - - - - N/A - - - - - - - Normalization Background: - - - - - - - false - - - - 0 - 0 - - - - - 250 - 0 - - - - - - - - - 25 - 16777215 - - - - or - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Browse ... - - - - - - - - 100 - 0 - - - - N/A - - - - - - - - - Qt::Vertical - - - - - - - - - Container: - - - - - - - false - - - - 0 - 0 - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - - - - - - 25 - 16777215 - - - - or - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Browse ... - - - - - - - N/A - - - - - - - Container Background: - - - - - - - false - - - - 0 - 0 - - - - - 250 - 0 - - - - - 200 - 16777215 - - - - - - - - or - - - - - - - - 100 - 0 - - - - - 100 - 16777215 - - - - Browse ... - - - - - - - N/A - - - - - - - - - - - - - - 0 - - - - PDF - - - - - - - - Q range - - - - - - - 35 - 0 - - - - - 35 - 16777215 - - - - Qmin - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 0 - - - - - - - - 30 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å<span style=" vertical-align:super;">-1</span></p></body></html> - - - - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Qmax - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 40 - - - - - - - - 30 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å<span style=" vertical-align:super;">-1</span></p></body></html> - - - - - - - - 35 - 0 - - - - - 35 - 16777215 - - - - <html><head/><body><p><span style=" font-size:11pt;">∆Q</span></p></body></html> - - - Qt::RichText - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 0.02 - - - - - - - - 30 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å<span style=" vertical-align:super;">-1</span></p></body></html> - - - - - - - Reset - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - R range - - - - - - - 35 - 0 - - - - - 35 - 16777215 - - - - Rmin - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 0 - - - - - - - - 30 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å</p></body></html> - - - - - - - - 40 - 0 - - - - - 40 - 16777215 - - - - Rmax - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 40 - - - - - - - - 30 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å</p></body></html> - - - - - - - - 35 - 0 - - - - - 35 - 16777215 - - - - <html><head/><body><p><span style=" font-size:11pt;">∆R</span></p></body></html> - - - Qt::RichText - - - - - - - - 80 - 0 - - - - - 80 - 16777215 - - - - 0.02 - - - - - - - - 25 - 0 - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Å</p></body></html> - - - - - - - Reset - - - - - - - - - - - - Qt::Vertical - - - - 20 - 63 - - - - - - - - - - Initialize Reduction - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Reduction Config. File - - - - - - - - - 50 - 0 - - - - - 50 - 16777215 - - - - Name: - - - - - - - - - - .json - - - - - - - - - Run Reduction - - - - - - - - - - - - - Bragg - - - - - - - - - - - 200 - 0 - - - - Browse Calibration ... - - - - - - - - 0 - 0 - - - - N/A - - - - - - - - - Qt::Vertical - - - - - - - - - - 200 - 0 - - - - Browse Characterization ... - - - - - - - - 0 - 0 - - - - N/A - - - - - - - - - - - - - Number of Bins: - - - - - - - - 0 - 0 - - - - -6000 - - - - - - - ("-" for log binning) - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Crop Wavelength - - - - - - Min - - - - - - - .1 - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&#8491;</p></body></html> - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Max - - - - - - - 2.9 - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">&#8491;</p></body></html> - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Vanadium Radius: - - - - - - - 0.58 - - - - - - - ?units? - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - Output Directory ... - - - - - - - - 0 - 0 - - - - N/A - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - false - - - - 200 - 0 - - - - Run Reduction - - - - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 255 - 0 - 0 - - - - - - - - - 128 - 128 - 128 - - - - - - - - ? - - - - - - - - - - - - - - - - 70 - 110 - 1241 - 281 - - - - - 800 - 0 - - - - Qt::CustomContextMenu - - - true - - - QAbstractItemView::SelectRows - - - false - - - false - - - true - - - false - - - true - - - false - - - - - - - - - Runs - - - - - Background Runs - - - - - Background Background Runs - - - - - Material - - - - - Runs - - - - - Background Runs - - - - - Background Background Runs - - - - - Material - - - - - - - 70 - 80 - 1241 - 25 - - - - - 0 - 25 - - - - - 16777215 - 25 - - - - - Title - - - - - Sample - - - - - Vanadium - - - - - - - 1330 - 80 - 281 - 311 - - - - - Item - - - - - New Column - - - - - Title - - - - - Sample - - - - Runs - - - - - Background - - - - Runs - - - - - Background Runs - - - - - - Material - - - - - - - - - - - Vanadium - - - - Runs - - - - - Background - - - - Runs - - - - - Background Runs - - - - - - - - - - - - - Processing - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - - - - - 30 - 30 - - - - - 30 - 30 - - - - - - - - - - - - 200 - 0 - - - - - 1677215 - 16777215 - - - - - - - - - - - - 30 - 30 - - - - - 20 - 30 - - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - - 30 - 30 - - - - - 30 - 30 - - - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - 0 - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - - - true - - - QAbstractItemView::ScrollPerPixel - - - - - - - - 0 - 20 - - - - - 16777215 - 20 - - - - Qt::ScrollBarAlwaysOn - - - Qt::ScrollBarAlwaysOff - - - true - - - QAbstractItemView::ScrollPerPixel - - - - - - - - - Runs - - - - - Background - - - - - Packing Fraction - - - - - Geometry - - - - - - - - - 0 - 0 - - - - - - - - - 138 - 226 - 52 - - - - - - - - - 138 - 226 - 52 - - - - - - - - - 145 - 141 - 126 - - - - - - - - Qt::CustomContextMenu - - - Qt::ScrollBarAlwaysOn - - - 1 - - - true - - - QAbstractItemView::ContiguousSelection - - - QAbstractItemView::ScrollPerPixel - - - false - - - false - - - - - - - - - - - - - - Runs - - - - - Background Runs - - - - - - - - - - Shape - - - - - Radius - - - - - Height - - - - - - - - - - - - - 0 - 28 - - - - - 16777215 - 28 - - - - Reduction Configuration ... - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 0 - - - - Calibration - - - - - - - 100 - 28 - - - - - 100 - 28 - - - - Browse ... - - - - - - - - 20 - 0 - - - - - 20 - 16777215 - - - - or - - - - - - - - 100 - 28 - - - - - 100 - 28 - - - - Make ... - - - - - - - - 0 - 0 - - - - - 500 - 0 - - - - N/A - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - 0 - 28 - - - - - 16777215 - 28 - - - - - PDF - - - - - Bragg - - - - - - - - - 0 - 28 - - - - - 16777215 - 28 - - - - Launch Reduction - - - - - - - - - - - - - Rietveld - - - - - - 8 - - - Qt::Horizontal - - - 20 - - - - - - - - - QLayout::SetMinimumSize - - - - - QLayout::SetMinimumSize - - - - - SNS Powder Reduction Configuration for NOMAD - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 0 - 0 - - - - - - - - - - - 0 - 0 - - - - - 10 - - - - - TOF - - - - - d-Spacing - - - - - Q - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - <html><head/><body><p>Load GSS/S(Q)/general 3-column ASCII</p><p>1. GSS: load and then split to 6 workspaces with single spectrum. Finally group all 6 workspaces to a workspace group</p></body></html> - - - Load - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Bank 1 - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Bank 2 - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Bank 3 - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Bank 4 - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Bank 5 - - - - - - - Qt::Vertical - - - QSizePolicy::Ignored - - - - 20 - 40 - - - - - - - - Bank 6 - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - - 9 - - - - Multiple Banks - - - - - - - - 9 - - - - Multiple GSAS - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - - 10 - - - - Rescale - - - - - - - - 10 - - - - Color/Style - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 10 - - - - Clear Canvas - - - - - - - - - - - - - 0 - 0 - - - - - 0 - 0 - - - - - 1677215 - 16777215 - - - - - 200 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - Calculate G(R) - - - - - - 8 - - - Qt::Horizontal - - - 20 - - - - Qt::Vertical - - - - - 0 - 0 - - - - - 50 - 300 - - - - - - - 0 - 0 - - - - - 50 - 300 - - - - - - - - - - - - - - - 10 - - - - <html><head/><body><p>Clear S(Q) Canvas</p></body></html> - - - Clear S(Q) - - - - - - - - 0 - 0 - - - - - 75 - true - - - - <html><head/><body><p>Load S(Q) from the reduction tab. Plot S(Q), S(Q)-1 or Q[S(Q)-1] according to the selected radio buttons below.</p><p><span style=" font-weight:600;">Use regular file loader at this phase.</span></p><p>Duplicate the function in FastGR/scripts/fastgr</p><p>149 def read_SQ_file(self):</p><p><br/></p></body></html> - - - Load SQ - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 10 - - - - <html><head/><body><p>Change line's color/style</p></body></html> - - - Color/Style - - - - - - - - 10 - - - - Rescale - - - - - - - - S(Q) - - - - - S(Q)-1 - - - - - Q[S(Q)-1] - - - - - - - - - 10 - - - - Edit S(Q) - - - - - - - - 10 - 75 - true - - - - Save S(Q) - - - - - - - - - Qt::Vertical - - - QSizePolicy::Preferred - - - - 20 - 40 - - - - - - - - - - - - - - 75 - true - - - - Generate GR - - - - - - - <html><head/><body><p>PDF Type</p></body></html> - - - - - - - - - - 10 - 75 - true - - - - Qt::LeftToRight - - - rho0 - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - 0 - 0 - - - - - - - - - - - - 10 - 75 - true - - - - Filter - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - Qmin - - - - - - - - 7 - - - - <html><head/><body><p>Show or hide the vertical indicators for Qmin and Qmax</p></body></html> - - - Show Min/Max - - - - - - - Qmax - - - - - - - - 10 - - - - 0.010000000000000 - - - 10.000000000000000 - - - 0.010000000000000 - - - - - - - - 10 - - - - 1.000000000000000 - - - 1000.000000000000000 - - - 0.500000000000000 - - - - - - - - - - - - - - - deltaR - - - - - - - Rmax - - - - - - - Rmin - - - - - - - - 10 - - - - 0.100000000000000 - - - 4.000000000000000 - - - 0.100000000000000 - - - - - - - - 10 - - - - 0.010000000000000 - - - 1.000000000000000 - - - 0.010000000000000 - - - 0.100000000000000 - - - - - - - - 10 - - - - 5.000000000000000 - - - 1000.000000000000000 - - - 20.000000000000000 - - - - - - - - - - 0 - 0 - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - Load G(r) - - - - - - - - 75 - true - - - - Save G(r) - - - - - - - - 10 - - - - Clear G(r) - - - - - - - - 10 - - - - Rescale - - - - - - - - 10 - - - - Color/Style - - - - - - - - 10 - 75 - true - - - - Generate S(Q) - - - - - - - - - - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - - - - - - - 0 - 0 - 1711 - 22 - - - - - 0 - 0 - - - - - File - - - - Configuration - - - - - - - - - - - - - - Edit - - - - - - - Help - - - - - - - Tools - - - - - - - - - - - - - Reset GSAS-tab - - - - - Reset GofR-tab - - - - - Quit - - - - - Cheat sheet - - - - - About ... - - - - - Preview Ascii ... - - - - - true - - - Settings ... - - - - - Save Configuration ... - - - - - Load ... - - - - - Save ... - - - - - Job Monitor ... - - - - - false - - - Undo Table Edit - - - - - false - - - Redo Table Edit - - - - - IPTS File Transfer ... - - - - - Settings ... - - - - - select_current_folder_button - diamond - diamond_background - vanadium - vanadium_background - sample_background - first_scan - last_scan - frequency - recalibration_yes - recalibration_no - renormalization_yes - renormalization_no - autotemplate_yes - autotemplate_no - postprocessing_no - comments - create_folder_button - auto_manual_folder - manual_output_folder - manual_output_folder_field - manual_output_folder_button - run_autonom_script - pushButton_2 - scrollArea - move_to_button - import_button - export_button - populate_table - table - background_no - background_yes - background_comboBox - tabWidget - fourier_filter_from - fourier_filter_to - hydrogen_yes - hydrogen_no - plazcek_fit_range_min - plazcek_fit_range_max - q_range_min - q_range_max - pushButton - muscat_yes - muscat_no - scale_data_yes - scale_data_no - run_rmc_yes - run_rmc_no - run_ndabs_output_file_name - run_ndabs_button - pdf_qmax_line_edit - interactive_mode_checkbox - run_sum_scans_button - comboBox_xUnit - pushButton_loadBraggFile - checkBox_bank1 - checkBox_bank2 - checkBox_bank3 - checkBox_bank4 - checkBox_bank5 - checkBox_bank6 - radioButton_multiBank - radioButton_multiGSS - pushButton_rescaleGSAS - pushButton_gsasColorStyle - pushButton_clearSofQ - pushButton_loadSQ - pushButton_sqColorStyle - pushButton_rescaleSq - comboBox_SofQType - comboBox_SofQ - pushButton_generateGR - comboBox_pdfType - lineEdit_rho - pushButton_showQMinMax - doubleSpinBoxQmin - doubleSpinBoxQmax - doubleSpinBoxRmin - doubleSpinBoxDelR - doubleSpinBoxRmax - pushButton_loadGofR - pushButton_saveGR - pushButton_clearGrCanvas - pushButton_rescaleGr - pushButton_grColorStyle - sum_scans_output_file_name - main_tab - pushButton_3 - pushButton_4 - - - - - - - actionAbout - triggered() - MainWindow - help_about_clicked() - - - -1 - -1 - - - 673 - 451 - - - - - action_preview_ascii - triggered() - MainWindow - action_preview_ascii_clicked() - - - -1 - -1 - - - 673 - 451 - - - - - actionAdvanced - triggered() - MainWindow - advanced_option_clicked() - - - -1 - -1 - - - 673 - 451 - - - - - actionLoad - triggered() - MainWindow - action_load_configuration_clicked() - - - -1 - -1 - - - 610 - 430 - - - - - actionSave - triggered() - MainWindow - action_save_configuration_clicked() - - - -1 - -1 - - - 610 - 430 - - - - - actionJob_Monitor - triggered() - MainWindow - window_job_monitor_clicked() - - - -1 - -1 - - - 678 - 528 - - - - - actionUndo - triggered() - MainWindow - action_undo_clicked() - - - -1 - -1 - - - 678 - 528 - - - - - actionRedo - triggered() - MainWindow - action_redo_clicked() - - - -1 - -1 - - - 678 - 528 - - - - - actionIPTS_File_Transfer - triggered() - MainWindow - menu_ipts_file_transfer_clicked() - - - -1 - -1 - - - 678 - 528 - - - - - move_to_button - clicked() - MainWindow - move_to_folder_clicked() - - - 69 - 115 - - - 580 - 419 - - - - - vanadium_background - editingFinished() - MainWindow - vanadium_background_edited() - - - 130 - 109 - - - 580 - 419 - - - - - diamond_background - editingFinished() - MainWindow - diamond_background_edited() - - - 130 - 109 - - - 580 - 419 - - - - - manual_output_folder_field - editingFinished() - MainWindow - manual_output_folder_field_edited() - - - 130 - 125 - - - 580 - 419 - - - - - sample_background - editingFinished() - MainWindow - sample_background_edited() - - - 130 - 109 - - - 580 - 419 - - - - - run_autonom_script - clicked() - MainWindow - run_autonom() - - - 130 - 129 - - - 580 - 419 - - - - - vanadium - editingFinished() - MainWindow - vanadium_edited() - - - 130 - 109 - - - 580 - 419 - - - - - select_current_folder_button - clicked() - MainWindow - select_current_folder_clicked() - - - 173 - 109 - - - 594 - 0 - - - - - auto_manual_folder - clicked() - MainWindow - output_folder_radio_buttons() - - - 130 - 125 - - - 580 - 419 - - - - - manual_output_folder - clicked() - MainWindow - output_folder_radio_buttons() - - - 130 - 125 - - - 580 - 419 - - - - - table - cellChanged(int,int) - MainWindow - check_step2_gui() - - - 712 - 222 - - - 656 - 370 - - - - - populate_table - clicked() - MainWindow - populate_table_clicked() - - - 1668 - 148 - - - 580 - 419 - - - - - background_yes - clicked() - MainWindow - yes_background_clicked() - - - 163 - 434 - - - 580 - 419 - - - - - diamond - editingFinished() - MainWindow - diamond_edited() - - - 130 - 109 - - - 580 - 419 - - - - - background_comboBox - currentIndexChanged(int) - MainWindow - background_combobox_changed() - - - 607 - 435 - - - 580 - 419 - - - - - create_folder_button - clicked(bool) - MainWindow - create_new_autonom_folder_button_clicked() - - - 120 - 125 - - - 83 - 860 - - - - - manual_output_folder_button - clicked() - MainWindow - manual_output_folder_button_clicked() - - - 130 - 125 - - - 1220 - 825 - - - - - table - customContextMenuRequested(QPoint) - MainWindow - table_right_click() - - - 644 - 222 - - - 580 - 419 - - - - - plazcek_fit_range_max - editingFinished() - MainWindow - check_plazcek_widgets() - - - 792 - 593 - - - 580 - 419 - - - - - hydrogen_no - clicked() - MainWindow - no_hydrogen_clicked() - - - 1107 - 559 - - - 580 - 419 - - - - - pushButton - clicked() - MainWindow - reset_q_range() - - - 571 - 578 - - - 5 - 594 - - - - - q_range_max - editingFinished() - MainWindow - check_q_range() - - - 316 - 578 - - - 6 - 690 - - - - - plazcek_fit_range_min - editingFinished() - MainWindow - check_plazcek_widgets() - - - 725 - 593 - - - 580 - 419 - - - - - fourier_filter_from - editingFinished() - MainWindow - check_fourier_filter_widgets() - - - 154 - 708 - - - 580 - 419 - - - - - hydrogen_yes - clicked() - MainWindow - hydrogen_clicked() - - - 937 - 559 - - - 580 - 419 - - - - - run_ndabs_output_file_name - textChanged(QString) - MainWindow - output_file_name_changed() - - - 973 - 862 - - - 1028 - 860 - - - - - q_range_min - editingFinished() - MainWindow - check_q_range() - - - 184 - 578 - - - 3 - 649 - - - - - fourier_filter_to - editingFinished() - MainWindow - check_fourier_filter_widgets() - - - 912 - 708 - - - 580 - 419 - - - - - run_ndabs_button - clicked() - MainWindow - run_ndabs_clicked() - - - 1313 - 862 - - - 580 - 419 - - - - - run_sum_scans_button - clicked() - MainWindow - run_sum_scans_clicked() - - - 1540 - 886 - - - 1194 - 860 - - - - - pdf_qmax_line_edit - editingFinished() - MainWindow - pdf_qmax_line_edit_changed() - - - 1621 - 674 - - - 1158 - 21 - - - - - export_button - clicked() - MainWindow - export_table_clicked() - - - 519 - 148 - - - 493 - 22 - - - - - sum_scans_output_file_name - editingFinished() - MainWindow - sum_scans_output_file_name_changed() - - - 1612 - 824 - - - 1103 - 809 - - - - - pushButton_2 - clicked() - MainWindow - help_button_clicked() - - - 50 - 129 - - - 956 - 803 - - - - - import_button - clicked() - MainWindow - import_table_clicked() - - - 77 - 148 - - - 243 - 22 - - - - - main_tab - currentChanged(int) - MainWindow - main_tab_widget_changed() - - - 141 - 50 - - - 201 - 27 - - - - - pushButton_4 - clicked() - MainWindow - help_button_clicked_scans() - - - 1645 - 886 - - - 915 - 807 - - - - - pushButton_3 - clicked() - MainWindow - help_button_clicked_ndabs() - - - 1339 - 862 - - - 966 - 808 - - - - - create_exp_ini_button - clicked() - MainWindow - create_exp_ini_clicked() - - - 117 - 129 - - - 2 - 978 - - - - - splitter - splitterMoved(int,int) - MainWindow - resize_table_post_processing_tab() - - - 121 - 96 - - - 678 - 528 - - - - - name_search - returnPressed() - MainWindow - name_search_clicked() - - - 1642 - 115 - - - 1356 - 117 - - - - - clear_name_search - clicked() - MainWindow - clear_name_search_clicked() - - - 1668 - 115 - - - 1353 - 79 - - - - - settings_table_button - clicked() - MainWindow - personalization_table_clicked() - - - 60 - 109 - - - 1550 - 24 - - - - - h3_table - customContextMenuRequested(QPoint) - MainWindow - h3_table_right_click() - - - 130 - 118 - - - 1710 - 538 - - - - - name_search_3 - textChanged(QString) - MainWindow - table_search() - - - 230 - 109 - - - 785 - 28 - - - - - clear_search_button - clicked() - MainWindow - table_search_clear() - - - 60 - 109 - - - 1146 - 25 - - - - - pushButton_5 - clicked() - MainWindow - reduction_configuration_button_clicked() - - - 130 - 116 - - - 270 - 982 - - - - - browse_calibration_button - clicked() - MainWindow - browse_calibration_clicked() - - - 130 - 116 - - - 619 - 982 - - - - - make_calibration_button - clicked() - MainWindow - make_calibration_clicked() - - - 130 - 116 - - - 847 - 981 - - - - - actionSettings - triggered() - MainWindow - advanced_option_clicked() - - - -1 - -1 - - - 855 - 503 - - - - - - diamond_edited() - diamond_background_edited() - vanadium_edited() - vanadium_background_edited() - sample_background_edited() - output_folder_radio_buttons() - manual_output_folder_field_edited() - run_autonom() - table_right_click() - run_ndabs_clicked() - populate_table_clicked() - check_plazcek_widgets() - hydrogen_clicked() - no_hydrogen_clicked() - check_fourier_filter_widgets() - create_sample_properties_files_clicked() - yes_background_clicked() - background_combobox_changed() - move_to_folder_clicked() - check_step2_gui() - reset_q_range() - check_q_range() - run_sum_scans_clicked() - browse_ascii_file_clicked() - select_current_folder_clicked() - manual_output_folder_button_clicked() - help_about_clicked() - action_preview_ascii_clicked() - output_file_name_changed() - create_new_autonom_folder_button_clicked() - advanced_option_clicked() - mantid_browse_calibration_clicked() - mantid_browse_characterization_clicked() - mantid_output_directory_clicked() - check_mantid_gui() - mantid_run_reduction() - pdf_qmax_line_edit_changed() - import_table_clicked() - export_table_clicked() - action_load_configuration_clicked() - action_save_configuration_clicked() - sum_scans_output_file_name_changed() - main_tab_widget_changed() - help_button_clicked_autonom() - help_button_clicked_ndabs() - help_button_clicked_scans() - help_button_clicked_mantid() - window_job_monitor_clicked() - create_exp_ini_clicked() - resize_table_post_processing_tab() - test_resizing_widget() - name_search_clicked() - clear_name_search_clicked() - action_undo_clicked() - action_redo_clicked() - menu_ipts_file_transfer_clicked() - make_calibration_clicked() - personalization_table_clicked() - h3_table_right_click() - table_search() - table_search_clear() - reduction_configuration_button_clicked() - browse_calibration_clicked() - slot1() - set_pytest() - - diff --git a/addie/ui/splitui_calculategr_tab.ui b/addie/ui/splitui_calculategr_tab.ui index 5b777d01..42cf0095 100644 --- a/addie/ui/splitui_calculategr_tab.ui +++ b/addie/ui/splitui_calculategr_tab.ui @@ -549,7 +549,7 @@ - + false @@ -594,23 +594,6 @@ - - - - false - - - - 10 - 75 - true - - - - Generate S(Q) - - - diff --git a/addie/utilities/customtreeview.py b/addie/utilities/customtreeview.py index 81b326fd..404dda2f 100644 --- a/addie/utilities/customtreeview.py +++ b/addie/utilities/customtreeview.py @@ -392,7 +392,7 @@ def has_ancestor(q_item, ancestor_name): has = False while not has and q_item is not None: - if q_item.text() == ancestor_name: + if ancestor_name.lower() == q_item.text().lower()[0:4]: has = True else: q_item = q_item.parent()