Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LET modifications for cycle 2015/1 #369

Merged
merged 5 commits into from Mar 11, 2015
Merged

LET modifications for cycle 2015/1 #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6df011e
Re #11292 This should fix it
abuts Mar 9, 2015
8ea0a27
Merge branch 'master' into 11292_LET_cycle2015_1_changes
abuts Mar 9, 2015
211070a
Re #11292 "fixing" failing system test for LET
abuts Mar 9, 2015
870d551
Re #11292 Fixing error with non-standard file extension not propa-
abuts Mar 10, 2015
4834942
Re #11292 Merge branch 'master' into 11292_LET_cycle2015_1_changes
abuts Mar 10, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
46 changes: 12 additions & 34 deletions Code/Mantid/Testing/SystemTests/tests/analysis/ISIS_LETReduction.py
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@ def find_binning_range(energy,ebin):
mult=2.8868
dt_DAE = 1
else:
raise RuntimeError("Find_binning_range: unsupported/unknown instrument found")
raise RuntimeError("Find_binning_range: unsupported/unknown instrument found")

energy=float(energy)

Expand All @@ -48,30 +48,6 @@ def find_binning_range(energy,ebin):

return (energybin,tbin,t_elastic)
#--------------------------------------------------------------------------------------------------------
def find_background(ws_name,bg_range):
""" Function to find background from multirep event workspace
dt_DAE = 1 for MERLIN and 1.6 for LET
should be precalculated or taken from IDF

# THIS FUNCTION SHOULD BE MADE GENERIC AND MOVED OUT OF HERE
"""
InstrName = config['default.instrument'][0:3]
if InstrName.find('LET')>-1:
dt_DAE = 1.6
elif InstrName.find('MER')>-1:
dt_DAE = 1
else:
raise RuntimeError("Find_binning_range: unsupported/unknown instrument found")

bg_ws_name = 'bg'
delta=bg_range[1]-bg_range[0]
Rebin(InputWorkspace='w1',OutputWorkspace=bg_ws_name,Params=[bg_range[0],delta,bg_range[1]],PreserveEvents=False)
v=(delta)/dt_DAE
CreateSingleValuedWorkspace(OutputWorkspace='d',DataValue=v)
Divide(LHSWorkspace=bg_ws_name,RHSWorkspace='d',OutputWorkspace=bg_ws_name)
return bg_ws_name


class ReduceLET_OneRep(ReductionWrapper):
@MainProperties
def def_main_properties(self):
Expand Down Expand Up @@ -200,18 +176,20 @@ def def_advanced_properties(self):

prop['monovan_mapfile'] = 'rings_103.map'
prop['save_format'] = ''
# if two input files with the same name and different extension found, what to prefer.
# if two input files with the same name and different extension found, what to prefer.
prop['data_file_ext']='.nxs' # for LET it may be choice between event and histo mode if
# raw file is written in histo, and nxs -- in event mode

# Absolute units: map file to calculate monovan integrals
prop['monovan_mapfile'] = 'rings_103.map'
# change this to correct value and verify that motor_log_names refers correct and existing
#Change this to correct value and verify that motor_log_names refers correct and existing
# log name for crystal rotation to write correct psi value into nxspe files
prop['motor_offset']=None

#TODO: Correct monitor, depending on workspace. This has to be loaded from the workspace and work without this settings
#prop['ei-mon1-spec']=40966
#BUG TODO: old IDF-s do not have this property. In this case, new IDF overrides the old one
# Should be possibility to define spectra_to_monitors_list to just monitors list, if
# spectra_to_monitors_list remains undefined
prop['spectra_to_monitors_list']=5506
return prop
#
@iliad
Expand All @@ -233,7 +211,7 @@ def reduce(self,input_file=None,output_directory=None):
return res

def __init__(self,web_var=None):
""" sets properties defaults for the instrument with Name"""
"""Sets properties defaults for the instrument with Name"""
ReductionWrapper.__init__(self,'LET',web_var)

def set_custom_output_filename(self):
Expand Down Expand Up @@ -265,9 +243,9 @@ def custom_name(prop_man):
#----------------------------------------------------------------------------------------------------------------------

if __name__=="__main__":
maps_dir = 'd:/Data/MantidSystemTests/Data'
data_dir ='d:/Data/Mantid_Testing/14_11_27'
ref_data_dir = 'd:/Data/MantidSystemTests/SystemTests/AnalysisTests/ReferenceResults'
maps_dir = r'd:\Data\MantidDevArea\Datastore\DataCopies\Testing\Data\SystemTest'
data_dir = r'd:\Data\Mantid_Testing\15_03_01'
ref_data_dir = r'd:\Data\MantidDevArea\Datastore\DataCopies\Testing\SystemTests\tests\analysis\reference'
config.setDataSearchDirs('{0};{1};{2}'.format(data_dir,maps_dir,ref_data_dir))
#config.appendDataSearchDir('d:/Data/Mantid_GIT/Test/AutoTestData')
config['defaultsave.directory'] = data_dir # folder to save resulting spe/nxspe files. Defaults are in
Expand Down Expand Up @@ -314,4 +292,4 @@ def custom_name(prop_man):
#if not rez:
# raise RuntimeError("validation failed with error: {0}".format(mess))
#else:
# print "ALL Fine"
# print "ALL Fine"