diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h index 43785174bf6d781017469382343943d8752deb47..8bd1fc8b223e94ec43d1d44582fa8cded8fe3b66 100644 --- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h +++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h @@ -175,7 +175,8 @@ public: std::string fittingRunNoFactory(std::string bank, std::string fileName, std::string &bankDir, std::string fileDir); - void updateFittingDirVec(std::string &bankDir, std::string &focusedFile, bool multi_run); + void updateFittingDirVec(std::string &bankDir, std::string &focusedFile, + bool multi_run); std::string readPeaksFile(std::string fileDir); @@ -277,7 +278,6 @@ private slots: void setBankDir(int idx); void listViewFittingRun(); - // show the standard Mantid help window with this interface's help void openHelpWin(); diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp index 9ef7145a579490f8b475a4488e34cf328e81e57e..3f8a0e87f6dc172f393dde5309c019fe2ac9b729 100644 --- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp +++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp @@ -1420,7 +1420,6 @@ void MantidQt::CustomInterfaces::EnggDiffractionViewQtGUI:: // assuming that no directory is found so look for number // if run number length greater } else if (focusedFile.count() > 4) { - /// SHAHROZ if (strFocusedFile.find("-") != std::string::npos) { std::vector<std::string> firstLastRunNoVec; boost::split(firstLastRunNoVec, strFocusedFile, boost::is_any_of("-")); @@ -1523,13 +1522,11 @@ void MantidQt::CustomInterfaces::EnggDiffractionViewQtGUI::enableMultiRun( for (int i = firstNum; i <= lastNum; i++) { RunNumberVec.push_back(std::to_string(i)); } - /// shahroz // if given a single run number instead for (int i = 0; i < RunNumberVec.size(); i++) { updateFittingDirVec(m_focusDir, RunNumberVec[i], true); } - // std::minus<int>() int diff = (lastNum - firstNum) + 1; auto global_vec_size = m_fitting_runno_dir_vec.size(); if (diff == global_vec_size) { diff --git a/docs/source/interfaces/Engineering_Diffraction.rst b/docs/source/interfaces/Engineering_Diffraction.rst index 5470eff208d46158d2b3fa7cdd7a3f85904642e6..eb4470cec1048840debdb913761433c819418a3d 100644 --- a/docs/source/interfaces/Engineering_Diffraction.rst +++ b/docs/source/interfaces/Engineering_Diffraction.rst @@ -275,7 +275,8 @@ background fit peaks in those areas using a peak fitting function. To use the Fitting tab, user is required to provide: -1. A focused file as Focus Run input by browsing or entering run number +1. A focused file as Focus Run input by browsing or entering single/multi + run number 2. List of expected peaks which can be either by browsing a (*CSV*) file or entering within the text-field simply click on the Fit button. @@ -286,15 +287,19 @@ These parameters are required to process Fitting successfully: Focused Run #: Focused workspace directory or selected with the help of browse button. - User may also select the file by simply entering the file run number, - which is located within the focused output directory. + User may also select the file/s by simply entering the file run number + or a range of consecutive run number separated by dash (`-`), for + example: "194547-194550" or "241391-241399". It is compulsory for + these file/s to be located within the focused output directory. Focused workspace can be generated with the help of :ref:`focus-Engineering_Diffraction-ref` tab, the output folder directory can be set in the :ref:`setting-Engineering_Diffraction-ref` tab under the *Focusing settings* section. - The interface will automatically select all the bank files found with the - same run-number and update the Plot Bank combo-box and Bank list - accordingly. + When a valid range of consecutive run numbers is given, the interface will + automatically import and add the run number/s to the list on the right side + of the graph, from where each run number can be selected from by click on it. + The interface will then automatically update the Plot Bank combo-box + according to the bank files found for each entered/selected run-number. .. _ExpectedPeaks-Engineering_Diffraction-ref: