Skip to content
Snippets Groups Projects
Commit 402c7508 authored by Samuel Jackson's avatar Samuel Jackson
Browse files

Merge branch 'feature/9209_can_file_in_diffraction' of... 

Merge branch 'feature/9209_can_file_in_diffraction' of github.com:mantidproject/mantid into feature/9209_can_file_in_diffraction
parents d7bb69fe efbf4f4d
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 133 additions and 262 deletions
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.h
+ 0
− 3
View file @ 402c7508
......@@ -33,9 +33,6 @@ public slots:
void openDirectoryDialog();
void help();
private slots:
void scaleMultiplierCheck(bool state);
private:
/// Initialize the layout
virtual void initLayout();
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDiffractionReduction.ui
+ 17
− 152
View file @ 402c7508
......@@ -6,26 +6,20 @@
<rect>
<x>0</x>
<y>0</y>
<width>488</width>
<height>472</height>
<width>495</width>
<height>351</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="windowTitle">
<string>Indirect Diffraction</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLabel" name="set_lbInst">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Fixed">
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -43,7 +37,7 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="techniques">
<property name="techniques" stdset="0">
<stringlist>
<string>TOF Indirect Geometry Spectroscopy</string>
<string>TOF Indirect Geometry Diffraction</string>
......@@ -53,12 +47,6 @@
</item>
<item>
<widget class="QLabel" name="set_lbReflection">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Reflection</string>
</property>
......@@ -90,131 +78,32 @@
</layout>
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<property name="sizeConstraint">
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item row="0" column="2">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_rawFiles">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_rawFiles" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>41</verstretch>
</sizepolicy>
</property>
<property name="label" stdset="0">
<string/>
<string>Run Numbers</string>
</property>
<property name="multipleFiles" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="3">
<item>
<widget class="QCheckBox" name="dem_ckSumFiles">
<property name="text">
<string>Sum Files</string>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_4">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Run Numbers:</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QGroupBox" name="gbCanInput">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Can Input</string>
</property>
<property name="flat">
<bool>false</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0">
<widget class="QCheckBox" name="ckUseCan">
<property name="text">
<string>Use Can</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_canFile">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>41</verstretch>
</sizepolicy>
</property>
<property name="label" stdset="0">
<string/>
</property>
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QCheckBox" name="ckScaleCan">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Scale Can</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="le_scaleFactor">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>1.0</string>
</property>
<property name="placeholderText">
<string/>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_11">
<item>
......@@ -229,12 +118,6 @@
</item>
<item>
<widget class="QLabel" name="label_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Spectra Max</string>
</property>
......@@ -248,7 +131,7 @@
<item>
<widget class="QStackedWidget" name="swVanadium">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -268,9 +151,9 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_calFile">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_calFile" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -284,7 +167,7 @@
<property name="optional" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions">
<property name="fileExtensions" stdset="0">
<stringlist>
<string>.cal</string>
</stringlist>
......@@ -292,12 +175,12 @@
</widget>
</item>
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_vanadiumFile">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dem_vanadiumFile" native="true">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
......@@ -322,12 +205,6 @@
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QGroupBox" name="gbRebin">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Rebin in D-Spacing (optional)</string>
</property>
......@@ -403,12 +280,6 @@
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLabel" name="lbPlotType">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Plot Type:</string>
</property>
......@@ -432,12 +303,6 @@
</item>
<item>
<widget class="QGroupBox" name="gbSave">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Select which file formats the data should be saved in.</string>
</property>
......
Code/Mantid/MantidQt/CustomInterfaces/src/IndirectDiffractionReduction.cpp
+ 6
− 58
View file @ 402c7508
......@@ -4,13 +4,11 @@
#include "MantidQtCustomInterfaces/IndirectDiffractionReduction.h"
#include "MantidQtAPI/ManageUserDirectories.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/MultiFileNameParser.h"
#include <QDesktopServices>
#include <QUrl>
#include <QFileInfo>
//Add this class to the list of specialised dialogs in this namespace
namespace MantidQt
......@@ -81,20 +79,6 @@ void IndirectDiffractionReduction::demonRun()
pyInput += "reducer.set_sum_files(True)\n";
}
//if we're using a can, add it to the reduction and set the scaling factor
if(m_uiForm.ckUseCan->isChecked())
{
QFileInfo finfo(m_uiForm.dem_canFile->getFirstFilename());
pyInput += "reducer.set_container('" + finfo.baseName() + "')\n";
//can is reduced as well, then dedcuted in post processing
pyInput += "reducer.append_data_file('" + m_uiForm.dem_canFile->getFirstFilename()+ "')\n";
if(m_uiForm.ckScaleCan->isChecked())
{
pyInput += "reducer.set_container_scale_factor(" + m_uiForm.le_scaleFactor->text() + ")\n";
}
}
pyInput += "formats = []\n";
if ( m_uiForm.ckGSS->isChecked() ) pyInput += "formats.append('gss')\n";
if ( m_uiForm.ckNexus->isChecked() ) pyInput += "formats.append('nxs')\n";
......@@ -221,6 +205,7 @@ void IndirectDiffractionReduction::instrumentSelected(int)
m_uiForm.dem_ckSumFiles->setChecked(true);
m_uiForm.dem_ckSumFiles->setEnabled(false);
}
}
void IndirectDiffractionReduction::reflectionSelected(int)
......@@ -252,10 +237,7 @@ void IndirectDiffractionReduction::reflectionSelected(int)
pyOutput = runPythonCode(pyInput).trimmed();
bool showVanadiumInput = (pyOutput == "Vanadium");
m_uiForm.gbCanInput->setVisible(!showVanadiumInput);
if ( showVanadiumInput )
if ( pyOutput == "Vanadium" )
{
m_uiForm.swVanadium->setCurrentIndex(0);
}
......@@ -263,6 +245,8 @@ void IndirectDiffractionReduction::reflectionSelected(int)
{
m_uiForm.swVanadium->setCurrentIndex(1);
}
}
void IndirectDiffractionReduction::openDirectoryDialog()
......@@ -288,15 +272,10 @@ void IndirectDiffractionReduction::initLayout()
connect(m_uiForm.cbInst, SIGNAL(currentIndexChanged(int)), this, SLOT(instrumentSelected(int)));
connect(m_uiForm.cbReflection, SIGNAL(currentIndexChanged(int)), this, SLOT(reflectionSelected(int)));
connect(m_uiForm.ckUseCan, SIGNAL(toggled(bool)), m_uiForm.dem_canFile, SLOT(setEnabled(bool)));
connect(m_uiForm.ckUseCan, SIGNAL(toggled(bool)), m_uiForm.ckScaleCan, SLOT(setEnabled(bool)));
connect(m_uiForm.ckUseCan, SIGNAL(toggled(bool)), this, SLOT(scaleMultiplierCheck(bool)));
connect(m_uiForm.ckScaleCan, SIGNAL(toggled(bool)), m_uiForm.le_scaleFactor, SLOT(setEnabled(bool)));
m_valInt = new QIntValidator(this);
m_valDbl = new QDoubleValidator(this);
m_uiForm.le_scaleFactor->setValidator(m_valDbl);
m_uiForm.set_leSpecMin->setValidator(m_valInt);
m_uiForm.set_leSpecMax->setValidator(m_valInt);
......@@ -339,42 +318,11 @@ void IndirectDiffractionReduction::saveSettings()
settings.endGroup();
}
/**
* Disables/enables the relevant parts of the UI when user checks/unchecks the 'Scale' option
* m_uiForm.ckScaleCan checkbox.
* @param state :: state of the checkbox
*/
void IndirectDiffractionReduction::scaleMultiplierCheck(bool state)
{
//scale input should be disabled if we're not using a can
if(!m_uiForm.ckUseCan->isChecked())
{
m_uiForm.le_scaleFactor->setEnabled(false);
}
else
{
//else it should be whatever the scale checkbox is
state = m_uiForm.ckScaleCan->isChecked();
m_uiForm.le_scaleFactor->setEnabled(state);
}
}
bool IndirectDiffractionReduction::validateDemon()
{
UserInputValidator uiv;
bool rawValid = true;
if ( ! m_uiForm.dem_rawFiles->isValid() ) { rawValid = false; }
if( m_uiForm.ckUseCan->isChecked() && m_uiForm.ckUseCan->isVisible())
{
uiv.checkMWRunFilesIsValid("Can File", m_uiForm.dem_canFile);
if(m_uiForm.ckScaleCan->isChecked() && m_uiForm.le_scaleFactor->text().isEmpty())
{
uiv.addErrorMessage("Invalid value for can scale factor.");
}
}
QString rebStartTxt = m_uiForm.leRebinStart->text();
QString rebStepTxt = m_uiForm.leRebinWidth->text();
QString rebEndTxt = m_uiForm.leRebinEnd->text();
......@@ -414,7 +362,7 @@ bool IndirectDiffractionReduction::validateDemon()
}
}
return rawValid && rebinValid && uiv.generateErrorMessage().isEmpty();
return rawValid && rebinValid;
}
}
......
Code/Mantid/instrument/IRIS_diffraction_diffonly_Parameters.xml
+ 8
− 0
View file @ 402c7508
......@@ -6,6 +6,14 @@
<value val="diffraction" />
</parameter>
<parameter name="analyser" type="string">
<value val="diff" />
</parameter>
<parameter name="reflection" type="string">
<value val="only" />
</parameter>
<parameter name="spectra-min">
<value val="3" />
</parameter>
......
Code/Mantid/instrument/IRIS_diffraction_diffspec_Parameters.xml
+ 8
− 0
View file @ 402c7508
......@@ -6,6 +6,14 @@
<value val="diffraction" />
</parameter>
<parameter name="analyser" type="string">
<value val="diff" />
</parameter>
<parameter name="reflection" type="string">
<value val="spec" />
</parameter>
<parameter name="spectra-min">
<value val="105" />
</parameter>
......
Code/Mantid/instrument/OSIRIS_diffraction_diffonly_Parameters.xml
+ 8
− 0
View file @ 402c7508
......@@ -7,6 +7,14 @@
<value val="diffraction" />
</parameter>
<parameter name="analyser" type="string">
<value val="diff" />
</parameter>
<parameter name="reflection" type="string">
<value val="only" />
</parameter>
<parameter name="spectra-min">
<value val="3" />
</parameter>
......
Code/Mantid/instrument/OSIRIS_diffraction_diffspec_Parameters.xml
+ 8
− 0
View file @ 402c7508
......@@ -6,6 +6,14 @@
<value val="diffraction" />
</parameter>
<parameter name="analyser" type="string">
<value val="diff" />
</parameter>
<parameter name="reflection" type="string">
<value val="spec" />
</parameter>
<parameter name="spectra-min">
<value val="3" />
</parameter>
......
Code/Mantid/instrument/TOSCA_diffraction_diffspec_Parameters.xml
+ 12
− 0
View file @ 402c7508
......@@ -7,6 +7,14 @@
<value val="diffraction" />
</parameter>
<parameter name="analyser" type="string">
<value val="diff" />
</parameter>
<parameter name="reflection" type="string">
<value val="spec" />
</parameter>
<parameter name="spectra-min">
<value val="146" />
</parameter>
......@@ -23,6 +31,10 @@
<value val="1" />
</parameter>
<parameter name="Workflow.NamingConvention" type="string">
<value val="AnalyserReflection" />
</parameter>
<!-- These two properties being set to invalid values (-1) will signal to the
reducer that it is not to correct for monitor efficiency.
-->
......
Code/Mantid/instrument/VESUVIO_diffraction_diffspec_Parameters.xml
+ 8
− 0
View file @ 402c7508
......@@ -7,6 +7,14 @@
<value val="diffraction" />
</parameter>
<parameter name="analyser" type="string">
<value val="diff" />
</parameter>
<parameter name="reflection" type="string">
<value val="spec" />
</parameter>
<parameter name="spectra-min">
<value val="3" />
</parameter>
......
Code/Mantid/scripts/Inelastic/IndirectCommon.py
+ 9
− 0
View file @ 402c7508
......@@ -93,6 +93,15 @@ def getEfixed(workspace, detIndex=0):
inst = mtd[workspace].getInstrument()
return inst.getNumberParameter("efixed-val")[0]
def checkUnitIs(ws, unit_id, axis_index=0):
"""
Check that the workspace has the correct units by comparing
against the UnitID.
"""
axis = mtd[ws].getAxis(axis_index)
unit = axis.getUnit()
return (unit.unitID() == unit_id)
# Get the default save directory and check it's valid
def getDefaultWorkingDirectory():
workdir = config['defaultsave.directory']
......
Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
+ 47
− 24
View file @ 402c7508
......@@ -834,13 +834,12 @@ def CubicFit(inputWS, spec, Verbose=False):
logger.notice('Group '+str(spec)+' of '+inputWS+' ; fit coefficients are : '+str(Abs))
return Abs
def applyCorrections(inputWS, canWS, corr, Verbose=False):
def applyCorrections(inputWS, canWS, corr, diffraction_run=False, Verbose=False):
'''Through the PolynomialCorrection algorithm, makes corrections to the
input workspace based on the supplied correction values.'''
# Corrections are applied in Lambda (Wavelength)
efixed = getEfixed(inputWS) # Get efixed
theta,Q = GetThetaQ(inputWS)
sam_name = getWSprefix(inputWS)
ConvertUnits(InputWorkspace=inputWS, OutputWorkspace=inputWS, Target='Wavelength',
EMode='Indirect', EFixed=efixed)
......@@ -891,17 +890,21 @@ def applyCorrections(inputWS, canWS, corr, Verbose=False):
CloneWorkspace(InputWorkspace=CorrectedSampleWS, OutputWorkspace=CorrectedWS)
else:
ConjoinWorkspaces(InputWorkspace1=CorrectedWS, InputWorkspace2=CorrectedSampleWS,
CheckOverlapping=False)
CheckOverlapping=False)
ConvertUnits(InputWorkspace=inputWS, OutputWorkspace=inputWS, Target='DeltaE',
EMode='Indirect', EFixed=efixed)
ConvertUnits(InputWorkspace=CorrectedWS, OutputWorkspace=CorrectedWS, Target='DeltaE',
EMode='Indirect', EFixed=efixed)
ConvertSpectrumAxis(InputWorkspace=CorrectedWS, OutputWorkspace=CorrectedWS+'_rqw',
Target='ElasticQ', EMode='Indirect', EFixed=efixed)
RenameWorkspace(InputWorkspace=CorrectedWS, OutputWorkspace=CorrectedWS+'_red')
if canWS != '':
ConvertUnits(InputWorkspace=canWS, OutputWorkspace=canWS, Target='DeltaE',
EMode='Indirect', EFixed=efixed)
DeleteWorkspace('Fit_NormalisedCovarianceMatrix')
DeleteWorkspace('Fit_Parameters')
DeleteWorkspace('Fit_Workspace')
......@@ -914,33 +917,48 @@ def abscorFeeder(sample, container, geom, useCor, corrections, Verbose=False, Sc
StartTime('ApplyCorrections')
workdir = config['defaultsave.directory']
s_hist,sxlen = CheckHistZero(sample)
diffraction_run = checkUnitIs(sample, 'dSpacing')
sam_name = getWSprefix(sample)
efixed = getEfixed(sample)
ext = '_red'
if not diffraction_run:
efixed = getEfixed(sample)
if container != '':
CheckAnalysers(sample,container,Verbose)
CheckHistSame(sample,'Sample',container,'Container')
CheckHistSame(sample, 'Sample', container, 'Container')
if not diffraction_run:
CheckAnalysers(sample, container, Verbose)
if diffraction_run and not checkUnitIs(container, 'dSpacing'):
raise ValueError("Sample and Can must both have the same units.")
(instr, can_run) = getInstrRun(container)
if ScaleOrNotToScale:
Scale(InputWorkspace=container, OutputWorkspace=container, Factor=factor, Operation='Multiply')
if Verbose:
logger.notice('Container scaled by '+str(factor))
if useCor:
if diffraction_run:
raise NotImplementedError("Applying absorption corrections is not currently supported for diffraction data.")
if Verbose:
text = 'Correcting sample ' + sample
if container != '':
text += ' with ' + container
logger.notice(text)
cor_result = applyCorrections(sample, container, corrections, Verbose)
rws = mtd[cor_result+'_red']
outNm= cor_result + '_Result_'
cor_result = applyCorrections(sample, container, corrections, diffraction_run, Verbose)
rws = mtd[cor_result + ext]
outNm = cor_result + '_Result_'
if Save:
cred_path = os.path.join(workdir,cor_result+'_red.nxs')
SaveNexusProcessed(InputWorkspace=cor_result+'_red',Filename=cred_path)
cred_path = os.path.join(workdir,cor_result + ext + '.nxs')
SaveNexusProcessed(InputWorkspace=cor_result + ext, Filename=cred_path)
if Verbose:
logger.notice('Output file created : '+cred_path)
calc_plot = [cor_result+'_red',sample]
calc_plot = [cor_result + ext, sample]
res_plot = cor_result+'_rqw'
else:
if ( container == '' ):
......@@ -949,21 +967,26 @@ def abscorFeeder(sample, container, geom, useCor, corrections, Verbose=False, Sc
sub_result = sam_name +'Subtract_'+ can_run
if Verbose:
logger.notice('Subtracting '+container+' from '+sample)
Minus(LHSWorkspace=sample,RHSWorkspace=container,OutputWorkspace=sub_result)
ConvertSpectrumAxis(InputWorkspace=sub_result, OutputWorkspace=sub_result+'_rqw',
Target='ElasticQ', EMode='Indirect', EFixed=efixed)
RenameWorkspace(InputWorkspace=sub_result, OutputWorkspace=sub_result+'_red')
rws = mtd[sub_result+'_red']
outNm= sub_result + '_Result_'
if not diffraction_run:
ConvertSpectrumAxis(InputWorkspace=sub_result, OutputWorkspace=sub_result + '_rqw',
Target='ElasticQ', EMode='Indirect', EFixed=efixed)
RenameWorkspace(InputWorkspace=sub_result, OutputWorkspace=sub_result + ext)
rws = mtd[sub_result + ext]
outNm = sub_result + '_Result_'
if Save:
sred_path = os.path.join(workdir,sub_result+'_red.nxs')
SaveNexusProcessed(InputWorkspace=sub_result+'_red',Filename=sred_path)
sred_path = os.path.join(workdir,sub_result + ext + '.nxs')
SaveNexusProcessed(InputWorkspace=sub_result + ext, Filename=sred_path)
if Verbose:
logger.notice('Output file created : '+sred_path)
res_plot = sub_result+'_rqw'
logger.notice('Output file created : ' + sred_path)
res_plot = sub_result + '_rqw'
if (PlotResult != 'None'):
plotCorrResult(res_plot,PlotResult)
plotCorrResult(res_plot, PlotResult)
if ( container != '' ):
sws = mtd[sample]
......
Code/Mantid/scripts/Inelastic/IndirectDiffractionReduction.py
+ 2
− 25
View file @ 402c7508
import mantid
from msg_reducer import MSGReducer
import inelastic_indirect_reduction_steps as steps
from mantid.simpleapi import *
class MSGDiffractionReducer(MSGReducer):
"""Reducer for Diffraction on IRIS and TOSCA.
"""
_container_workspace = None
_container_scale_factor = None
def __init__(self):
super(MSGDiffractionReducer, self).__init__()
......@@ -49,27 +45,8 @@ class MSGDiffractionReducer(MSGReducer):
step.set_formats(self._save_formats)
self.append_step(step)
def post_process(self):
#if we're using a can, normalise by beam current and subtact from the sample
if self._container_workspace is not None:
NormaliseByCurrent(self._container_workspace, OutputWorkspace=self._container_workspace)
#scale if required
if self._container_scale_factor is not None:
Scale(self._container_workspace, Factor=self._container_scale_factor,
OutputWorkspace=self._container_workspace)
workspaces = self.get_result_workspaces()
for ws in workspaces:
if ws != self._container_workspace:
NormaliseByCurrent(ws, OutputWorkspace=ws)
Minus(ws, self._container_workspace, OutputWorkspace=ws)
def set_container(self, container):
self._container_workspace = container
def set_container_scale_factor(self, factor):
self._container_scale_factor = factor
step = steps.Naming()
self.append_step(step)
def getStringProperty(workspace, property):
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment