Skip to content

Commit

Permalink
refs #11304. u, v to U, V
Browse files Browse the repository at this point in the history
  • Loading branch information
@OwenArnold
OwenArnold committed Apr 1, 2015
1 parent 83f31fc commit ed491ad
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 18 deletions.
12 changes: 6 additions & 6 deletions Code/Mantid/Framework/PythonInterface/plugins/algorithms/WorkflowAlgorithms/CreateMD.py
View file
Expand Up @@ -114,9 +114,9 @@ def PyInit(self):

self.declareProperty(FloatArrayProperty('Angdeg', values=[], validator=FloatArrayMandatoryValidator(), direction=Direction.Input ), doc='Lattice angles' )

self.declareProperty(FloatArrayProperty('u', values=[], validator=FloatArrayMandatoryValidator(), direction=Direction.Input ), doc='Lattice vector parallel to neutron beam' )
self.declareProperty(FloatArrayProperty('U', values=[], validator=FloatArrayMandatoryValidator(), direction=Direction.Input ), doc='Lattice vector parallel to neutron beam' )

self.declareProperty(FloatArrayProperty('v', values=[], validator=FloatArrayMandatoryValidator(), direction=Direction.Input ), doc='Lattice vector perpendicular to neutron beam in the horizontal plane' )
self.declareProperty(FloatArrayProperty('V', values=[], validator=FloatArrayMandatoryValidator(), direction=Direction.Input ), doc='Lattice vector perpendicular to neutron beam in the horizontal plane' )

self.declareProperty(FloatArrayProperty('Psi', values=[], direction=Direction.Input), doc='Psi rotation in degrees. Optional or one entry per run.' )

Expand All @@ -131,8 +131,8 @@ def _validate_inputs(self):
emode = self.getProperty('Emode').value
alatt = self.getProperty('Alatt').value
angdeg = self.getProperty('Angdeg').value
u = self.getProperty('u').value
v = self.getProperty('v').value
u = self.getProperty('U').value
v = self.getProperty('V').value
psi = self.getProperty('Psi').value
gl = self.getProperty('Gl').value
gs = self.getProperty('Gs').value
Expand Down Expand Up @@ -176,8 +176,8 @@ def PyExec(self):
emode = self.getProperty('Emode').value
alatt = self.getProperty('Alatt').value
angdeg = self.getProperty('Angdeg').value
u = self.getProperty('u').value
v = self.getProperty('v').value
u = self.getProperty('U').value
v = self.getProperty('V').value
psi = self.getProperty('Psi').value
gl = self.getProperty('Gl').value
gs = self.getProperty('Gs').value
Expand Down
20 changes: 10 additions & 10 deletions Code/Mantid/Framework/PythonInterface/test/python/plugins/algorithms/CreateMDTest.py
View file
Expand Up @@ -27,8 +27,8 @@ def test_set_up_madatory(self):
alg.setProperty("Emode", "Direct")
alg.setProperty("Alatt", [1,1,1])
alg.setProperty("Angdeg", [90,90,90])
alg.setProperty("u", [0,0,1])
alg.setProperty("v", [1,0,0])
alg.setProperty("U", [0,0,1])
alg.setProperty("V", [1,0,0])

def test_psi_right_size(self):

Expand All @@ -43,8 +43,8 @@ def test_psi_right_size(self):
alg.setProperty("Emode", "Direct")
alg.setProperty("Alatt", [1,1,1])
alg.setProperty("Angdeg", [90,90,90])
alg.setProperty("u", [0,0,1])
alg.setProperty("v", [1,0,0])
alg.setProperty("U", [0,0,1])
alg.setProperty("V", [1,0,0])
alg.setProperty("Psi", [0, 0, 0]) # Too large
alg.setProperty("Gl", [0]) # Right size
alg.setProperty("Gs", [0]) # Right size
Expand All @@ -64,8 +64,8 @@ def test_gl_right_size(self):
alg.setProperty("Emode", "Direct")
alg.setProperty("Alatt", [1,1,1])
alg.setProperty("Angdeg", [90,90,90])
alg.setProperty("u", [0,0,1])
alg.setProperty("v", [1,0,0])
alg.setProperty("U", [0,0,1])
alg.setProperty("V", [1,0,0])
alg.setProperty("Psi", [0]) # Right size
alg.setProperty("Gl", [0, 0]) # Too many
alg.setProperty("Gs", [0]) # Right size
Expand All @@ -85,8 +85,8 @@ def test_gs_right_size(self):
alg.setProperty("Emode", "Direct")
alg.setProperty("Alatt", [1,1,1])
alg.setProperty("Angdeg", [90,90,90])
alg.setProperty("u", [0,0,1])
alg.setProperty("v", [1,0,0])
alg.setProperty("U", [0,0,1])
alg.setProperty("V", [1,0,0])
alg.setProperty("Psi", [0]) # Right size
alg.setProperty("Gl", [0]) # Right size
alg.setProperty("Gs", [0,0]) # Too large
Expand All @@ -106,8 +106,8 @@ def test_execute_single_workspace(self):
alg.setProperty("InputWorkspaces", ['input_workspace'])
alg.setProperty("Alatt", [1,1,1])
alg.setProperty("Angdeg", [90,90,90])
alg.setProperty("u", [0,0,1])
alg.setProperty("v", [1,0,0])
alg.setProperty("U", [0,0,1])
alg.setProperty("V", [1,0,0])
alg.execute()
out_ws = AnalysisDataService.retrieve("mdworkspace")

Expand Down
4 changes: 2 additions & 2 deletions Code/Mantid/docs/source/algorithms/CreateMD-v1.rst
View file
Expand Up @@ -47,7 +47,7 @@ CreateMD steps use :ref:`algm-ConvertToMDMinMaxGlobal` to determine the min and
AddSampleLog(Workspace=current_ws,LogName='Ei',LogText='3.0',LogType='Number')

# Execute CreateMD
new_mdew = CreateMD(current_ws, Emode='Direct', Alatt=[1.4165, 1.4165,1.4165], Angdeg=[ 90, 90, 90], u=[1, 0, 0,], v=[0,1,0], Psi=6, Gs=0, Gl=[0])
new_mdew = CreateMD(current_ws, Emode='Direct', Alatt=[1.4165, 1.4165,1.4165], Angdeg=[ 90, 90, 90], U=[1, 0, 0,], V=[0,1,0], Psi=6, Gs=0, Gl=[0])

# Show dimensionality and dimension names
ndims = new_mdew.getNumDims()
Expand Down Expand Up @@ -84,7 +84,7 @@ Output
gs.append(0.0)

# Convert and merge
new_merged = CreateMD(input_runs, Emode='Direct', Alatt=[1.4165, 1.4165,1.4165], Angdeg=[ 90, 90, 90], u=[1, 0, 0,], v=[0,1,0], Psi=psi, Gl=gl, Gs=gs)
new_merged = CreateMD(input_runs, Emode='Direct', Alatt=[1.4165, 1.4165,1.4165], Angdeg=[ 90, 90, 90], U=[1, 0, 0,], V=[0,1,0], Psi=psi, Gl=gl, Gs=gs)

# Show dimensionality and dimension names
ndims = new_merged.getNumDims()
Expand Down

0 comments on commit ed491ad

Please sign in to comment.