Refs #35 Forgot to substitute Set by set

simulation/src/beamline/assemblemodel.py

@@ -405,7 +405,7 @@ def lowTResolution(model, simulated, resolution, convolved, expdata=None,
   p=argparse.ArgumentParser(description='Provider for services involving convolution of simulated S(Q,E) with a model beamline. Available services are: lowTresolution, modelBEC, modelB_EC_C, modelB_freeE_C.')
   p.add_argument('service', help='name of the service to invoke')
   p.add_argument('-explain', action='store_true', help='print message explaining the arguments to pass for the particular service')
-  if Set(['-h', '-help', '--help']).intersection(Set(sys.argv)): args=p.parse_args() # check if help message is requested
+  if set(['-h', '-help', '--help']).intersection(set(sys.argv)): args=p.parse_args() # check if help message is requested
   if 'lowTresolution' in sys.argv:
     p.description='Convolve simulated S(Q,E) with a model beamline. Resolution must be provided via a Nexus file. Generates a Nexus file containing S(Q,E) in a Workspace2D.' # update help message
     for action in p._actions:

simulation/src/beamline/convolve.py

@@ -108,7 +108,7 @@ def convolution(simulated, resolution, expdata, convolved, dak=None, norm2one=Fa
   p=argparse.ArgumentParser(description='Provider for services involving convolution of simulated S(Q,E) with a model beamline. Available services are: lowTresolution.')
   p.add_argument('service', help='name of the service to invoke')
   p.add_argument('-explain', action='store_true', help='print message explaining the arguments to pass for the particular service')
-  if Set(['-h', '-help', '--help']).intersection(Set(sys.argv)): args=p.parse_args() # check if help message is requested
+  if set(['-h', '-help', '--help']).intersection(set(sys.argv)): args=p.parse_args() # check if help message is requested
   if 'convolution' in sys.argv:
     p.description='Convolve simulated S(Q,E) with a resolution Nexus file. Generates a Nexus file containing the convolution.' # update help message
     for action in p._actions:

simulation/src/beamline/initparams.py

@@ -84,7 +84,7 @@ def modelB_freeE_C(modeltpl, elastic, convolved, expdata, initparfile=None):
   p=argparse.ArgumentParser(description='Provider for services involving initialization of model beamline parameters. Available models are: modelB_freeE_C')
   p.add_argument('service', help='name of the service to invoke')
   p.add_argument('-explain', action='store_true', help='print message explaining the arguments to pass for the particular service')
-  if Set(['-h', '-help', '--help']).intersection(Set(sys.argv)): args=p.parse_args() # check if help message is requested
+  if set(['-h', '-help', '--help']).intersection(set(sys.argv)): args=p.parse_args() # check if help message is requested
 
   if 'modelB_freeE_C' in sys.argv:
     p.description='''Estimate initial beamline parameters for the modelB_freeE_C

simulation/src/beamline/interpX.py

@@ -38,7 +38,7 @@ def itp_simple(workspace,shift,newWorkspace=None):
   p=argparse.ArgumentParser(description='Provider for services involving shift of calculated S(Q,E) model Available services are: itp_simple')
   p.add_argument('service', help='name of the service to invoke')
   p.add_argument('-explain', action='store_true', help='print message explaining the arguments to pass for the particular service')
-  if Set(['-h', '-help', '--help']).intersection(Set(sys.argv)): args=p.parse_args() # check if help message is requested
+  if set(['-h', '-help', '--help']).intersection(set(sys.argv)): args=p.parse_args() # check if help message is requested
 
   if 'itp_simple' in sys.argv:
     p.description='For all spectra of a mantid workspace, shift a small amount and interpolate through Mantid::Rebin' # update help message

simulation/src/beamline/resolution.py

@@ -37,7 +37,7 @@ def elasticLineLowTemp(insqe, outres=None):
   p=argparse.ArgumentParser(description='Provider for services involving the production of a resolution function. Available services are: elasticLineLowTemp')
   p.add_argument('service', help='name of the service to invoke')
   p.add_argument('-explain', action='store_true', help='print message explaining the arguments to pass for the particular service')
-  if Set(['-h', '-help', '--help']).intersection(Set(sys.argv)): args=p.parse_args() # check if help message is requested
+  if set(['-h', '-help', '--help']).intersection(set(sys.argv)): args=p.parse_args() # check if help message is requested
   if 'elasticLineLowTemp' in sys.argv:
     p.description='Produces a resolution function based on the quasi-elastic signal at low temperature'
     for action in p._actions: