Skip to content
Snippets Groups Projects
Unverified Commit 810500e3 authored by Ian Bush's avatar Ian Bush Committed by GitHub
Browse files

Merge pull request #23098 from rosswhitfield/ISISReflectometryAutoreductionTest_python3_fix

Fix ISISReflectometryAutoreductionTest for python 3
parents 1ccfe247 8045924b
No related branches found
No related tags found
No related merge requests found
......@@ -3,7 +3,6 @@ System Test for ISIS Reflectometry autoreduction
Adapted from scripts provided by Max Skoda.
"""
import re
import string
import itertools
import math
import stresstesting
......@@ -270,7 +269,7 @@ def AutoReduce(transRun=[], runRange=[], oldList=[]):
for item in sample:
runno = item[0]
angle = item[1]
runnos = string.split(runno, '+')
runnos = runno.split('+')
# check if runs have been added together
runnos = [int(i) for i in runnos]
......@@ -330,11 +329,9 @@ def AutoReduce(transRun=[], runRange=[], oldList=[]):
# print(Qmin, Qmax, dqq)
# print(overlapHigh)
if len(wq_list) > 1:
outputwksp = string.split(wq_list[0], sep='_')[
0] + '_' + string.split(wq_list[-1], sep='_')[0][3:]
outputwksp = wq_list[0].split('_')[0] + '_' + wq_list[-1].split('_')[0][3:]
else:
outputwksp = string.split(
wq_list[0], sep='_')[0] + '_IvsQ_binned'
outputwksp = wq_list[0].split('_')[0] + '_IvsQ_binned'
if not mtd.doesExist(outputwksp):
combineDataMulti(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment