Changeset 5367

Timestamp:

27/07/10 11:17:22 (6 weeks ago)

Author:

Michael Whitty

Message:

re #1385 - Indirect interface - adding background removal, now saves files

Location:

trunk/Code

Files:

• Mantid/PythonAPI/scripts/Excitations/IndirectEnergyConversion.py (modified) (6 diffs)
• qtiplot/MantidQt/CustomInterfaces/inc/Indirect.h (modified) (1 diff)
• qtiplot/MantidQt/CustomInterfaces/src/Indirect.cpp (modified) (6 diffs)

trunk/Code/Mantid/PythonAPI/scripts/Excitations/IndirectEnergyConversion.py

@@ -17 +17 @@
                         tmp_ws = outWS + str(i)
                         LoadRaw(rawfiles[i], tmp_ws)
-                        Plus(outWS, tmp_ws, outWS)
+                        try:
+                                Plus(outWS, tmp_ws, outWS)
+                        except:
+                                print 'Rawfiles do not match, not suitable for summing.'
+                                sys.exit('Rawfiles not suitable for summing.')
                         mantid.deleteWorkspace(tmp_ws)
                 workspace = mtd.getMatrixWorkspace(outWS)
@@ -168 +172 @@
         return outWS_n
 
-def convert_to_energy(rawfiles, mapfile, first, last, efixed, SumFiles=False, bgremove = [0, 0], tempK=-1, calib='', rebinParam='', cleanUp = True):
+def convert_to_energy(rawfiles, mapfile, first, last, efixed, SumFiles=False, bgremove = [0, 0], tempK=-1, calib='', rebinParam='', CleanUp = True, instrument='', savesuffix='', saveFormats = [], savedir=''):
         '''
         This function, when passed the proper arguments, will run through the steps of convert to energy
@@ -177 +181 @@
         or with the createMappingFile function.
         '''
-        output_workspaces = []
+        output_workspace_names = []
+        runNos = []
         workspace, ws_name = loadData(rawfiles, Sum=SumFiles)
         for i in range(0, len(workspace)):
@@ -183 +188 @@
                 MonWS_n = monitorEfficiency()
                 runNo = workspace[i].getRun().getLogData("run_number").value()
+                runNos.append(runNo)
                 CropWorkspace(ws_name[i], 'Time', StartWorkspaceIndex= (first - 1), EndWorkspaceIndex=( last - 1))
                 mantid.deleteWorkspace(ws_name[i])
@@ -192 +198 @@
                 cte = conToEnergy(efixed, outWS_n='EnergyRebinned' + str(i))
                 if ( rebinParam != ''):
-                        rebin = rebinData(rebinParam, inWS_n='EnergyRebinned' + str(i))
+                        rebin = rebinData(rebinParam, inWS_n=cte)
+                else:
+                        if CleanUp:
+                                RenameWorkspace(cte, 'Energy')
+                        else:
+                                CloneWorkspace(cte, 'Energy')
                 if ( tempK != -1 ):
                         db = detailedBalance(tempK)
                 scale = scaleAndGroup(mapfile, outWS_n='IconComplete' + str(i) + '_' + runNo)
-                output_workspaces.append(scale)
-        return output_workspaces
+                output_workspace_names.append(scale)
+        if ( saveFormats != [] ):
+                saveItems(output_workspace_names, runNos, saveFormats, instrument, savesuffix, directory = savedir)
 
 
@@ -231 +243 @@
         SaveNexusProcessed(outWS_n, savefile, 'Vanadium')
         return outWS_n
+
+def saveItems(workspaces, runNos, fileFormats, ins, suffix, directory = ''):
+        for i in range(0, len(workspaces)):
+                filename = ins + runNos[i] + '_' + suffix
+                if directory != '':
+                        filename = os.path.join(directory, filename)
+                for j in fileFormats:
+                        if j == 'spe':
+                                SaveSPE(workspaces[i], filename + '.spe')
+                        elif j == 'nxs':
+                                SaveNexusProcessed(workspaces[i], filename + '.nxs')
+                        else:
+                                print 'Save: unknown file type.'
+                                system.exit('Save: unknown file type.')

trunk/Code/qtiplot/MantidQt/CustomInterfaces/inc/Indirect.h

@@ -67 +67 @@
           void clearReflectionInfo(); ///< clear various line edit boxes
           QString createMapFile(const QString& groupType); ///< create the mapping file with which to group results
-          QString savePyCode(QString filePrefix); ///< create python code as string to save files
+          QString savePyCode(); ///< create python code as string to save files
           bool isDirty(); ///< state whether interface has had any changes
           void isDirty(bool state); ///< signify changes to interface

trunk/Code/qtiplot/MantidQt/CustomInterfaces/src/Indirect.cpp

@@ -101 +101 @@
         QString groupFile = createMapFile(m_uiForm.cbMappingOptions->currentText());
         if ( groupFile == "" )
-        {
                 return;
-        }
 
         QString filePrefix = m_uiForm.cbInst->itemData(m_uiForm.cbInst->currentIndex()).toString().toLower();
@@ -142 +140 @@
 
                 if ( m_uiForm.ckUseCalib->isChecked() )
-                {
-                        QString calibFile = m_uiForm.leCalibrationFile->text();
-                        pyInput += "calib = r'"+calibFile+"'\n";
-                }
+                        pyInput += "calib = r'"+m_uiForm.leCalibrationFile->text()+"'\n";
                 else
-                {
                         pyInput += "calib = ''\n";
-                }
 
                 pyInput += "efixed = "+m_uiForm.leEfixed->text()+"\n";
@@ -169 +162 @@
 
                 if ( m_uiForm.ckDetailedBalance->isChecked() )
-                {
                         pyInput += "tempK = "+m_uiForm.leDetailedBalance->text()+"\n";
-                }
                 else
-                {
                         pyInput += "tempK = -1\n";
-                }
 
                 pyInput += "mapfile = r'"+groupFile+"'\n";
 
-
-                pyInput += "icon_workspaces = ind.convert_to_energy(rawfiles, mapfile, first, last, efixed, SumFiles=Sum, bgremove = bgRemove, tempK = tempK, calib = calib, rebinParam = rebinParam)\n";
         }
 
         if (tryToSave)
         {
-        //      pyInput += "iconWS = scale\n";
-        //      pyInput += savePyCode(filePrefix);
-        }
+                pyInput += savePyCode();
+        }
+        else
+        {
+                pyInput +=
+                        "fileFormats = []\n"
+                        "ins = ''\n"
+                        "directory = ''\n"
+                        "suffix = ''\n";
+        }
+
+        pyInput += "ind.convert_to_energy(rawfiles, mapfile, "
+                "first, last, efixed, SumFiles=Sum, bgremove = bgRemove, tempK = tempK, calib = calib, "
+                "rebinParam = rebinParam, instrument = ins, savesuffix = suffix, saveFormats = fileFormats,"
+                "savedir = directory)\n";
 
         QString pyOutput = runPythonCode(pyInput).trimmed();
@@ -195 +194 @@
                 showInformationBox("The following error occurred:\n" + pyOutput
                         + "\n\nAnalysis did not complete.");
+                return;
         }
 
@@ -464 +464 @@
 
 /**
-* This function creates the Python script necessary to save the workspace data
-* in the formats requested.
+* This function creates the Python script necessary to set the variables used for saving data
+* in the main convert_to_energy script.
 * @return python code as a string
 */
-QString Indirect::savePyCode(QString filePrefix)
-{
-        QString pyInput = "\n# Save Files\n";
-        if ( m_uiForm.leNameSPE->text() != "" )
-        {
-                pyInput += "savefile = r'" +m_uiForm.leNameSPE->text()+ "'\n";
-        }
-        else {
-                pyInput +=
-                        "savefile = mtd.getConfigProperty('defaultsave.directory')\n"
-                        "savefile += '" +filePrefix+ "'\n";
-                if ( m_uiForm.cbAnalyser->currentText() == "graphite" )
-                {
-                        pyInput += "savefile += 'ipg'\n";
-                }
-                else if ( m_uiForm.cbAnalyser->currentText() == "mica" || m_uiForm.cbAnalyser->currentText() == "fmica" )
-                {
-                        pyInput += "savefile += 'imi'\n";
-                }
-        }
+QString Indirect::savePyCode()
+{
+        QString analyser = m_uiForm.cbAnalyser->currentText();
+
+        QString ins = m_uiForm.cbInst->itemData(m_uiForm.cbInst->currentIndex()).toString().toLower();
+        QString suffix = analyser + m_uiForm.cbReflection->currentText() + "_";
+        QString directory = m_uiForm.leNameSPE->text();
+
+        if ( analyser == "graphite" )
+                suffix += "ipg";
+        else if ( analyser == "mica" || analyser == "fmica" )
+                suffix += "imi";
+
+        QStringList fileFormats;
+        QString fileFormatList;
 
         if ( m_uiForm.save_ckNexus->isChecked() )
-        {
-                pyInput += "SaveNexusProcessed(iconWS, savefile + '.nxs')\n";
-        }
+                fileFormats << "nxs";
         if ( m_uiForm.save_ckSPE->isChecked() )
-        {
-                pyInput += "SaveSPE(iconWS, savefile + '.spe')\n";
-        }
+                fileFormats << "spe";
+
+        if ( fileFormats.size() != 0 )
+                fileFormatList = "[ '" + fileFormats.join("', '") + "']";
+        else
+                fileFormatList = "[]";
+
+        QString pyInput =
+                "# Save File Parameters\n"
+                "ins = '" + ins + "'\n"
+                "suffix = '" + suffix + "'\n"
+                "fileFormats = " + fileFormatList + "\n"
+                "directory = r'" + directory + "'\n";
 
         return pyInput;
@@ -695 +698 @@
 void Indirect::browseSave()
 {
-        QString Analyser = m_uiForm.cbAnalyser->currentText();
-        QString filePrefix = m_uiForm.cbInst->itemData(m_uiForm.cbInst->currentIndex()).toString().toLower();
-        filePrefix += "_" + Analyser + m_uiForm.cbReflection->currentText() + "_";
-
-        QString defSave = m_saveDir + filePrefix;
-        if ( Analyser == "graphite" )
-                defSave += "ipg";
-        else
-                defSave += "imi";
-        QString savFile = QFileDialog::getSaveFileName(this, "Save File Name",
-                defSave, "File Stem (*)");
-
-        if ( savFile != "" )
-        {
-                m_uiForm.leNameSPE->setText(savFile);
+        QString savDir = QFileDialog::getExistingDirectory(this, "Save Directory",
+                m_saveDir, QFileDialog::ShowDirsOnly);
+
+        if ( savDir != "" )
+        {
+                m_uiForm.leNameSPE->setText(savDir);
                 isDirty(true); 
         }