From 0b348b28427bdf6fd8ba99d5b42b75b07eb658ac Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 Nov 2020 21:14:29 +0100
Subject: [PATCH] and deg, not degree
---
Doc/FFCatalog/fig/ff2/bornplot.py | 8 +++---
Doc/FFCatalog/fig/ff2/sim_AnisoPyramid.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_Box.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_CantellatedCube.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Cone.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_Cone6.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_CosineRipple.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Cuboctahedron.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_Cylinder.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Dodecahedron_asy.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_Dodecahedron_sym.py | 8 +++---
.../fig/ff2/sim_EllipsoidalCylinder.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_FullSphere.py | 2 +-
Doc/FFCatalog/fig/ff2/sim_FullSpheroid.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_HemiEllipsoid.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Icosahedron_asy.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_Icosahedron_sym.py | 8 +++---
Doc/FFCatalog/fig/ff2/sim_Prism3.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Prism6.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Pyramid.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_Tetrahedron.py | 6 ++--
Doc/FFCatalog/fig/ff2/sim_TruncatedCube.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_TruncatedSphere.py | 4 +--
.../fig/ff2/sim_TruncatedSpheroid.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_demo_1quadrants.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_demo_4quadrants.py | 4 +--
Doc/FFCatalog/fig/ff2/sim_det_box.py | 2 +-
Examples/Demos/FitCylindersPrisms_movie.py | 6 ++--
Examples/Demos/simul_demo_cyl_SSCA.py | 6 ++--
Examples/Demos/simul_demo_cylsphere.py | 6 ++--
Examples/Demos/simul_demo_lattice1.py | 6 ++--
Examples/Demos/simul_demo_lattice2.py | 6 ++--
Examples/Demos/simul_demo_movie.py | 6 ++--
Examples/Demos/simul_demo_movie2.py | 6 ++--
Examples/Demos/simul_demo_movie3.py | 6 ++--
.../fit55_Specular/FitSpecularBasics.py | 2 +-
.../fit55_Specular/FitWithUncertainties.py | 2 +-
.../RealLifeReflectometryFitting.py | 2 +-
.../Python/PyCore/intensitydata_io.py | 10 +++----
.../Python/PyCore/polmagcylinders1.py | 8 +++---
.../Python/PyCore/polmagcylinders2.py | 6 ++--
.../Python/PyCore/transform_CoreShellBox.py | 8 +++---
.../Python/PyCore/transform_cube.py | 28 +++++++++----------
Tests/Performance/Python/test_performance.py | 6 ++--
45 files changed, 128 insertions(+), 128 deletions(-)
diff --git a/Doc/FFCatalog/fig/ff2/bornplot.py b/Doc/FFCatalog/fig/ff2/bornplot.py
index df86cc93e2d..89916a142ee 100644
--- a/Doc/FFCatalog/fig/ff2/bornplot.py
+++ b/Doc/FFCatalog/fig/ff2/bornplot.py
@@ -10,7 +10,7 @@ rc('text', usetex=True)
rc('image', cmap='inferno')
import bornagain as ba
-from bornagain import nm, degree, angstrom, deg2rad
+from bornagain import nm, deg, angstrom, deg2rad
class BinRange:
@@ -147,9 +147,9 @@ def get_simulation(det):
:param det: Detector limits
"""
simulation = ba.GISASSimulation()
- simulation.setDetectorParameters(det.phi.n, det.phi.vmin*degree,
- det.phi.vmax*degree, det.alpha.n,
- det.alpha.vmin*degree, det.alpha.vmax*degree)
+ simulation.setDetectorParameters(det.phi.n, det.phi.vmin*deg,
+ det.phi.vmax*deg, det.alpha.n,
+ det.alpha.vmin*deg, det.alpha.vmax*deg)
simulation.setBeamParameters(1.0*angstrom, 0, 0)
return simulation
diff --git a/Doc/FFCatalog/fig/ff2/sim_AnisoPyramid.py b/Doc/FFCatalog/fig/ff2/sim_AnisoPyramid.py
index 64d2649e614..bb9c090f537 100644
--- a/Doc/FFCatalog/fig/ff2/sim_AnisoPyramid.py
+++ b/Doc/FFCatalog/fig/ff2/sim_AnisoPyramid.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,8 +12,8 @@ for i in range(n):
omega = 90*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorAnisoPyramid(13*nm, 8*nm, 4.2*nm,
- 60.0*degree)
- trafo = ba.RotationZ(omega*degree)
+ 60.0*deg)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Box.py b/Doc/FFCatalog/fig/ff2/sim_Box.py
index a29492cbb8f..775b4ec3a55 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Box.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Box.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 90*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorBox(18*nm, 4.6*nm, 3*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_CantellatedCube.py b/Doc/FFCatalog/fig/ff2/sim_CantellatedCube.py
index 0450528a9a8..55c421c7cd0 100644
--- a/Doc/FFCatalog/fig/ff2/sim_CantellatedCube.py
+++ b/Doc/FFCatalog/fig/ff2/sim_CantellatedCube.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 45*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorTruncatedCube(6.4*nm, 1.5*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Cone.py b/Doc/FFCatalog/fig/ff2/sim_Cone.py
index cc428c8f687..d428fd6b6c5 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Cone.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Cone.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -11,8 +11,8 @@ results = []
for i in range(n):
theta = 30*i/(n - 1)
title = r'$\vartheta=%d^\circ$' % theta
- ff = ba.FormFactorCone(4*nm, 11*nm, 75*degree)
- trafo = ba.RotationY(theta*degree)
+ ff = ba.FormFactorCone(4*nm, 11*nm, 75*deg)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Cone6.py b/Doc/FFCatalog/fig/ff2/sim_Cone6.py
index ef82768f9a5..0b3bf3066f9 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Cone6.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Cone6.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -11,8 +11,8 @@ results = []
for i in range(n):
omega = 30*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
- ff = ba.FormFactorCone6(6*nm, 5*nm, 60*degree)
- trafo = ba.RotationZ(omega*degree)
+ ff = ba.FormFactorCone6(6*nm, 5*nm, 60*deg)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_CosineRipple.py b/Doc/FFCatalog/fig/ff2/sim_CosineRipple.py
index 9ad0c759eb0..d0b18c9b416 100644
--- a/Doc/FFCatalog/fig/ff2/sim_CosineRipple.py
+++ b/Doc/FFCatalog/fig/ff2/sim_CosineRipple.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 90*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorCosineRipple(25*nm, 10*nm, 8*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Cuboctahedron.py b/Doc/FFCatalog/fig/ff2/sim_Cuboctahedron.py
index c5c91417267..e2e48b105d7 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Cuboctahedron.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Cuboctahedron.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -11,8 +11,8 @@ results = []
for i in range(n):
omega = 45*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
- ff = ba.FormFactorCuboctahedron(8*nm, 5*nm, 0.5, 60.0*degree)
- trafo = ba.RotationZ(omega*degree)
+ ff = ba.FormFactorCuboctahedron(8*nm, 5*nm, 0.5, 60.0*deg)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Cylinder.py b/Doc/FFCatalog/fig/ff2/sim_Cylinder.py
index d877b421364..f2207535cb8 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Cylinder.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Cylinder.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, -5, 5, -5, 5)
@@ -12,7 +12,7 @@ for i in range(n):
theta = 135*i/(n - 1)
title = r'$\vartheta=%d^\circ$' % theta
ff = ba.FormFactorCylinder(3*nm, 8.8*nm)
- trafo = ba.RotationY(theta*degree)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_asy.py b/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_asy.py
index 621a9a649d8..d7de00539b5 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_asy.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_asy.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
import math
@@ -17,13 +17,13 @@ data = bp.run_simulation(det, ff)
results.append(bp.Result(0, data, title))
title = 'rotated'
-trafo = ba.RotationZ(13*degree)
+trafo = ba.RotationZ(13*deg)
ff = ba.FormFactorDodecahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(1, data, title))
title = 'rotated, tilted'
-trafo = ba.createProduct(ba.RotationX(9*degree), ba.RotationZ(13*degree))
+trafo = ba.createProduct(ba.RotationX(9*deg), ba.RotationZ(13*deg))
ff = ba.FormFactorDodecahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(2, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_sym.py b/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_sym.py
index 3f88c13e8c1..8c824457f14 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_sym.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Dodecahedron_sym.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
import math
@@ -12,19 +12,19 @@ results = []
edge = 3.2
title = 'face normal'
-trafo = ba.RotationY(26.5651*degree)
+trafo = ba.RotationY(26.5651*deg)
ff = ba.FormFactorDodecahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(0, data, title))
title = 'vertex normal'
-trafo = ba.RotationY(-52.6226*degree)
+trafo = ba.RotationY(-52.6226*deg)
ff = ba.FormFactorDodecahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(1, data, title))
title = 'edge normal'
-trafo = ba.RotationY(58.2825*degree)
+trafo = ba.RotationY(58.2825*deg)
ff = ba.FormFactorDodecahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(2, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_EllipsoidalCylinder.py b/Doc/FFCatalog/fig/ff2/sim_EllipsoidalCylinder.py
index 267a42f7e96..90b027e03f4 100644
--- a/Doc/FFCatalog/fig/ff2/sim_EllipsoidalCylinder.py
+++ b/Doc/FFCatalog/fig/ff2/sim_EllipsoidalCylinder.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 90*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorEllipsoidalCylinder(6.3*nm, 4.2*nm, 3*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_FullSphere.py b/Doc/FFCatalog/fig/ff2/sim_FullSphere.py
index eaf98cef1c9..3b5d5f95c80 100644
--- a/Doc/FFCatalog/fig/ff2/sim_FullSphere.py
+++ b/Doc/FFCatalog/fig/ff2/sim_FullSphere.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
diff --git a/Doc/FFCatalog/fig/ff2/sim_FullSpheroid.py b/Doc/FFCatalog/fig/ff2/sim_FullSpheroid.py
index 778a9ddbcba..19de6461ca6 100644
--- a/Doc/FFCatalog/fig/ff2/sim_FullSpheroid.py
+++ b/Doc/FFCatalog/fig/ff2/sim_FullSpheroid.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
theta = 90*i/(n - 1)
title = r'$\vartheta=%d^\circ$' % theta
ff = ba.FormFactorFullSpheroid(3*nm, 13*nm)
- trafo = ba.RotationY(theta*degree)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_HemiEllipsoid.py b/Doc/FFCatalog/fig/ff2/sim_HemiEllipsoid.py
index 16d45c97d06..18fb6fdbcee 100644
--- a/Doc/FFCatalog/fig/ff2/sim_HemiEllipsoid.py
+++ b/Doc/FFCatalog/fig/ff2/sim_HemiEllipsoid.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 90*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorHemiEllipsoid(10*nm, 3.8*nm, 3.2*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Icosahedron_asy.py b/Doc/FFCatalog/fig/ff2/sim_Icosahedron_asy.py
index fd458cc1e4b..b7ef328b0f4 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Icosahedron_asy.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Icosahedron_asy.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
import math
@@ -17,13 +17,13 @@ data = bp.run_simulation(det, ff)
results.append(bp.Result(0, data, title))
title = 'rotated'
-trafo = ba.RotationZ(13*degree)
+trafo = ba.RotationZ(13*deg)
ff = ba.FormFactorIcosahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(1, data, title))
title = 'rotated, tilted'
-trafo = ba.createProduct(ba.RotationX(9*degree), ba.RotationZ(13*degree))
+trafo = ba.createProduct(ba.RotationX(9*deg), ba.RotationZ(13*deg))
ff = ba.FormFactorIcosahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(2, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Icosahedron_sym.py b/Doc/FFCatalog/fig/ff2/sim_Icosahedron_sym.py
index dbd39f00f08..32c06640351 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Icosahedron_sym.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Icosahedron_sym.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
import math
@@ -12,19 +12,19 @@ results = []
edge = 4.8
title = 'face normal'
-trafo = ba.RotationY(48.1897*degree)
+trafo = ba.RotationY(48.1897*deg)
ff = ba.FormFactorIcosahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(0, data, title))
title = 'vertex normal'
-trafo = ba.RotationY(-52.6226*degree)
+trafo = ba.RotationY(-52.6226*deg)
ff = ba.FormFactorIcosahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(1, data, title))
title = 'edge normal'
-trafo = ba.RotationY(69.0948*degree)
+trafo = ba.RotationY(69.0948*deg)
ff = ba.FormFactorIcosahedron(edge*nm)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(2, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Prism3.py b/Doc/FFCatalog/fig/ff2/sim_Prism3.py
index e44f2ee9cd9..bc5922e9e8e 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Prism3.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Prism3.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 30*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorPrism3(13.8*nm, 3*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Prism6.py b/Doc/FFCatalog/fig/ff2/sim_Prism6.py
index 97d1f0dc799..5200c470ba7 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Prism6.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Prism6.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 30*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorPrism6(5.7*nm, 3*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Pyramid.py b/Doc/FFCatalog/fig/ff2/sim_Pyramid.py
index 03f8e2243b4..82ab3a344de 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Pyramid.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Pyramid.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -11,8 +11,8 @@ results = []
for i in range(n):
omega = 45*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
- ff = ba.FormFactorPyramid(10*nm, 4.2*nm, 60.0*degree)
- trafo = ba.RotationZ(omega*degree)
+ ff = ba.FormFactorPyramid(10*nm, 4.2*nm, 60.0*deg)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py b/Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py
index ef718ef24dc..c051fa4756a 100644
--- a/Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py
+++ b/Doc/FFCatalog/fig/ff2/sim_SawtoothRipple.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, -5, 5, -5, 5)
@@ -13,7 +13,7 @@ for i in range(n):
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorSawtoothRippleBox(25*nm, 10*nm, 8*nm,
5*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_Tetrahedron.py b/Doc/FFCatalog/fig/ff2/sim_Tetrahedron.py
index 5d1e3e8038c..279d6544434 100644
--- a/Doc/FFCatalog/fig/ff2/sim_Tetrahedron.py
+++ b/Doc/FFCatalog/fig/ff2/sim_Tetrahedron.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, -5, 5, -5, 5)
@@ -11,8 +11,8 @@ results = []
for i in range(n):
omega = 60*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
- ff = ba.FormFactorTetrahedron(12*nm, 8*nm, 75*degree)
- trafo = ba.RotationZ(omega*degree)
+ ff = ba.FormFactorTetrahedron(12*nm, 8*nm, 75*deg)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_TruncatedCube.py b/Doc/FFCatalog/fig/ff2/sim_TruncatedCube.py
index 0450528a9a8..55c421c7cd0 100644
--- a/Doc/FFCatalog/fig/ff2/sim_TruncatedCube.py
+++ b/Doc/FFCatalog/fig/ff2/sim_TruncatedCube.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
omega = 45*i/(n - 1)
title = r'$\omega=%d^\circ$' % omega
ff = ba.FormFactorTruncatedCube(6.4*nm, 1.5*nm)
- trafo = ba.RotationZ(omega*degree)
+ trafo = ba.RotationZ(omega*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_TruncatedSphere.py b/Doc/FFCatalog/fig/ff2/sim_TruncatedSphere.py
index 95d2e31f4eb..1ba4d1935fb 100644
--- a/Doc/FFCatalog/fig/ff2/sim_TruncatedSphere.py
+++ b/Doc/FFCatalog/fig/ff2/sim_TruncatedSphere.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
theta = 30*i/(n - 1)
title = r'$\vartheta=%d^\circ$' % theta
ff = ba.FormFactorTruncatedSphere(4.2*nm, 6.1*nm, 0)
- trafo = ba.RotationY(theta*degree)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_TruncatedSpheroid.py b/Doc/FFCatalog/fig/ff2/sim_TruncatedSpheroid.py
index 794287a249a..343141c4ca4 100644
--- a/Doc/FFCatalog/fig/ff2/sim_TruncatedSpheroid.py
+++ b/Doc/FFCatalog/fig/ff2/sim_TruncatedSpheroid.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -12,7 +12,7 @@ for i in range(n):
theta = 30*i/(n - 1)
title = r'$\vartheta=%d^\circ$' % theta
ff = ba.FormFactorTruncatedSpheroid(3.3*nm, 9.6*nm, 1.8, 0)
- trafo = ba.RotationY(theta*degree)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_demo_1quadrants.py b/Doc/FFCatalog/fig/ff2/sim_demo_1quadrants.py
index c2218134ac7..8e5e4c0d160 100644
--- a/Doc/FFCatalog/fig/ff2/sim_demo_1quadrants.py
+++ b/Doc/FFCatalog/fig/ff2/sim_demo_1quadrants.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, 0, 5, 0, 5)
@@ -13,7 +13,7 @@ for i in range(n):
theta = pars[i]
title = r'$\vartheta=%d^\circ$' % theta
ff = ba.FormFactorTruncatedSphere(4.2*nm, 6.1*nm, 0)
- trafo = ba.RotationY(theta*degree)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_demo_4quadrants.py b/Doc/FFCatalog/fig/ff2/sim_demo_4quadrants.py
index 454efa727b9..6d46f199045 100644
--- a/Doc/FFCatalog/fig/ff2/sim_demo_4quadrants.py
+++ b/Doc/FFCatalog/fig/ff2/sim_demo_4quadrants.py
@@ -2,7 +2,7 @@
Plot form factor.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(200, -5, 5, -5, 5)
@@ -13,7 +13,7 @@ for i in range(n):
theta = pars[i]
title = r'$\vartheta=%d^\circ$' % theta
ff = ba.FormFactorTruncatedSphere(4.2*nm, 6.1*nm, 0)
- trafo = ba.RotationY(theta*degree)
+ trafo = ba.RotationY(theta*deg)
data = bp.run_simulation(det, ff, trafo)
results.append(bp.Result(i, data, title))
diff --git a/Doc/FFCatalog/fig/ff2/sim_det_box.py b/Doc/FFCatalog/fig/ff2/sim_det_box.py
index 06901d5f9ff..12c7682ed0b 100644
--- a/Doc/FFCatalog/fig/ff2/sim_det_box.py
+++ b/Doc/FFCatalog/fig/ff2/sim_det_box.py
@@ -2,7 +2,7 @@
Plot form factors.
"""
import bornagain as ba
-from bornagain import nm, degree
+from bornagain import nm, deg
import bornplot as bp
det = bp.Detector(1000, 0, 5, 0, 5)
diff --git a/Examples/Demos/FitCylindersPrisms_movie.py b/Examples/Demos/FitCylindersPrisms_movie.py
index 87431c3cd72..217206387dc 100644
--- a/Examples/Demos/FitCylindersPrisms_movie.py
+++ b/Examples/Demos/FitCylindersPrisms_movie.py
@@ -95,9 +95,9 @@ def get_simulation():
Create GISAXS simulation with beam and detector defined
"""
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -1.0*degree, 1.0*degree, 100, 0.0*degree,
- 2.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -1.0*deg, 1.0*deg, 100, 0.0*deg,
+ 2.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
return simulation
diff --git a/Examples/Demos/simul_demo_cyl_SSCA.py b/Examples/Demos/simul_demo_cyl_SSCA.py
index f2df31acddf..c99456ad911 100644
--- a/Examples/Demos/simul_demo_cyl_SSCA.py
+++ b/Examples/Demos/simul_demo_cyl_SSCA.py
@@ -47,9 +47,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -4.0*degree, 4.0*degree, 100, 0.0*degree,
- 8.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -4.0*deg, 4.0*deg, 100, 0.0*deg,
+ 8.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setSample(multi_layer)
simulation.runSimulation()
# intensity data
diff --git a/Examples/Demos/simul_demo_cylsphere.py b/Examples/Demos/simul_demo_cylsphere.py
index 79d2bd7c539..aa83bec88d4 100644
--- a/Examples/Demos/simul_demo_cylsphere.py
+++ b/Examples/Demos/simul_demo_cylsphere.py
@@ -40,9 +40,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -4.0*degree, 4.0*degree, 100, 0.0*degree,
- 8.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -4.0*deg, 4.0*deg, 100, 0.0*deg,
+ 8.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setSample(multi_layer)
simulation.runSimulation()
# intensity data
diff --git a/Examples/Demos/simul_demo_lattice1.py b/Examples/Demos/simul_demo_lattice1.py
index dae5926a1ae..7dfd0f9d5e9 100644
--- a/Examples/Demos/simul_demo_lattice1.py
+++ b/Examples/Demos/simul_demo_lattice1.py
@@ -48,9 +48,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -2.0*degree, 2.0*degree, 100, 0.0*degree,
- 4.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -2.0*deg, 2.0*deg, 100, 0.0*deg,
+ 4.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
# run simulation
simulation.setSample(multi_layer)
diff --git a/Examples/Demos/simul_demo_lattice2.py b/Examples/Demos/simul_demo_lattice2.py
index 1d911220f27..e6b51006145 100644
--- a/Examples/Demos/simul_demo_lattice2.py
+++ b/Examples/Demos/simul_demo_lattice2.py
@@ -55,9 +55,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -2.0*degree, 2.0*degree, 100, 0.0*degree,
- 4.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -2.0*deg, 2.0*deg, 100, 0.0*deg,
+ 4.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
# run simulation
simulation.setSample(multi_layer)
diff --git a/Examples/Demos/simul_demo_movie.py b/Examples/Demos/simul_demo_movie.py
index ba65971aeab..52d5f97a671 100644
--- a/Examples/Demos/simul_demo_movie.py
+++ b/Examples/Demos/simul_demo_movie.py
@@ -46,9 +46,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -4.0*degree, 4.0*degree, 100, 0.0*degree,
- 8.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -4.0*deg, 4.0*deg, 100, 0.0*deg,
+ 8.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setSample(multi_layer)
simulation.runSimulation()
# intensity data
diff --git a/Examples/Demos/simul_demo_movie2.py b/Examples/Demos/simul_demo_movie2.py
index c1cf7499057..89f3dbfa132 100644
--- a/Examples/Demos/simul_demo_movie2.py
+++ b/Examples/Demos/simul_demo_movie2.py
@@ -47,9 +47,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -4.0*degree, 4.0*degree, 100, 0.0*degree,
- 8.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -4.0*deg, 4.0*deg, 100, 0.0*deg,
+ 8.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setSample(multi_layer)
simulation.runSimulation()
# intensity data
diff --git a/Examples/Demos/simul_demo_movie3.py b/Examples/Demos/simul_demo_movie3.py
index 3853450ef16..4ab8cfd7b60 100644
--- a/Examples/Demos/simul_demo_movie3.py
+++ b/Examples/Demos/simul_demo_movie3.py
@@ -52,9 +52,9 @@ def RunSimulation():
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -4.0*degree, 4.0*degree, 100, 0.0*degree,
- 8.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, -4.0*deg, 4.0*deg, 100, 0.0*deg,
+ 8.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setSample(multi_layer)
simulation.runSimulation()
# intensity data
diff --git a/Examples/Python/fit55_Specular/FitSpecularBasics.py b/Examples/Python/fit55_Specular/FitSpecularBasics.py
index 857e962ebd0..249ee9daf9f 100644
--- a/Examples/Python/fit55_Specular/FitSpecularBasics.py
+++ b/Examples/Python/fit55_Specular/FitSpecularBasics.py
@@ -64,7 +64,7 @@ def get_real_data():
filepath = path.join(path.dirname(path.realpath(__file__)), filename)
real_data = np.loadtxt(filepath, usecols=(0, 1), skiprows=3)
- # translating axis values from double incident angle (degrees)
+ # translating axis values from double incident angle (degs)
# to incident angle (radians)
real_data[:, 0] *= np.pi/360
get_real_data.data = real_data
diff --git a/Examples/Python/fit55_Specular/FitWithUncertainties.py b/Examples/Python/fit55_Specular/FitWithUncertainties.py
index b2fa6dbff47..c8f8a4ba671 100644
--- a/Examples/Python/fit55_Specular/FitWithUncertainties.py
+++ b/Examples/Python/fit55_Specular/FitWithUncertainties.py
@@ -69,7 +69,7 @@ def get_real_data():
filepath = path.join(path.dirname(path.realpath(__file__)), filename)
real_data = np.loadtxt(filepath, usecols=(0, 1), skiprows=3)
- # translating axis values from double incident angle (degrees)
+ # translating axis values from double incident angle (degs)
# to incident angle (radians)
real_data[:, 0] *= np.pi/360
get_real_data.data = real_data
diff --git a/Examples/Python/fit55_Specular/RealLifeReflectometryFitting.py b/Examples/Python/fit55_Specular/RealLifeReflectometryFitting.py
index b92ee38ea7d..d0674720d79 100644
--- a/Examples/Python/fit55_Specular/RealLifeReflectometryFitting.py
+++ b/Examples/Python/fit55_Specular/RealLifeReflectometryFitting.py
@@ -48,7 +48,7 @@ def get_real_data(filename="mg6a_Merged.txt.gz"):
filepath = path.join(path.dirname(path.realpath(__file__)), filename)
real_data = np.loadtxt(filepath, usecols=(0, 1, 3), skiprows=1)
- # translating axis values from double incident angle (degrees)
+ # translating axis values from double incident angle (degs)
# to incident angle (radians)
real_data[:, 0] *= np.pi/360
get_real_data.data = real_data
diff --git a/Tests/Functional/Python/PyCore/intensitydata_io.py b/Tests/Functional/Python/PyCore/intensitydata_io.py
index f9f09f0acaf..d0883d5acc3 100644
--- a/Tests/Functional/Python/PyCore/intensitydata_io.py
+++ b/Tests/Functional/Python/PyCore/intensitydata_io.py
@@ -4,7 +4,7 @@ import math, numpy, os, sys, time, unittest
sys.path.append("@CMAKE_LIBRARY_OUTPUT_DIRECTORY@")
import bornagain as ba
-from bornagain import degree, deg2rad, rad2deg
+from bornagain import deg, deg2rad, rad2deg
def fill_data(data):
@@ -110,8 +110,8 @@ class OutputDataIOTest(unittest.TestCase):
def test_07_ConstKBinAxis_2D(self):
data = ba.IntensityData()
- data.addAxis(ba.ConstKBinAxis("axis0", 9, -1.00000001*degree, 1.0*degree))
- data.addAxis(ba.ConstKBinAxis("axis1", 3, -4.0*degree, 5.0*degree))
+ data.addAxis(ba.ConstKBinAxis("axis0", 9, -1.00000001*deg, 1.0*deg))
+ data.addAxis(ba.ConstKBinAxis("axis1", 3, -4.0*deg, 5.0*deg))
fill_data(data)
ba.IntensityDataIOFactory.writeOutputData(data, "tmp.int")
newdata = ba.IntensityDataIOFactory.readOutputData("tmp.int")
@@ -119,8 +119,8 @@ class OutputDataIOTest(unittest.TestCase):
def test_08_CustomBinAxis_2D(self):
data = ba.IntensityData()
- data.addAxis(ba.CustomBinAxis("axis0", 9, -1.00000001*degree, 1.0*degree))
- data.addAxis(ba.CustomBinAxis("axis1", 3, -4.0*degree, 5.0*degree))
+ data.addAxis(ba.CustomBinAxis("axis0", 9, -1.00000001*deg, 1.0*deg))
+ data.addAxis(ba.CustomBinAxis("axis1", 3, -4.0*deg, 5.0*deg))
fill_data(data)
ba.IntensityDataIOFactory.writeOutputData(data, "tmp.int")
newdata = ba.IntensityDataIOFactory.readOutputData("tmp.int")
diff --git a/Tests/Functional/Python/PyCore/polmagcylinders1.py b/Tests/Functional/Python/PyCore/polmagcylinders1.py
index 373d79bfd08..a8f1398275b 100644
--- a/Tests/Functional/Python/PyCore/polmagcylinders1.py
+++ b/Tests/Functional/Python/PyCore/polmagcylinders1.py
@@ -3,7 +3,7 @@
from __future__ import print_function
import gzip, numpy, os, sys, utils
import bornagain as ba
-from bornagain import nm, angstrom, degree
+from bornagain import nm, angstrom, deg
# ----------------------------------
@@ -36,9 +36,9 @@ def runSimulation():
# build and run experiment
simulation = ba.GISASSimulation()
- simulation.setDetectorParameters(100, 0*degree, 2.0*degree, 100, 0.0*degree,
- 2.0*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, 0*deg, 2.0*deg, 100, 0.0*deg,
+ 2.0*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setSample(multi_layer)
simulation.setBeamIntensity(1e2)
simulation.runSimulation()
diff --git a/Tests/Functional/Python/PyCore/polmagcylinders2.py b/Tests/Functional/Python/PyCore/polmagcylinders2.py
index 76094f2516b..9a1451c4615 100644
--- a/Tests/Functional/Python/PyCore/polmagcylinders2.py
+++ b/Tests/Functional/Python/PyCore/polmagcylinders2.py
@@ -42,11 +42,11 @@ def getSimulationIntensity(rho_beam, efficiency):
# build and run experiment
simulation = GISASSimulation()
- simulation.setDetectorParameters(100, -1*degree, 1.0*degree, 100, 0.0*degree,
- 2.0*degree)
+ simulation.setDetectorParameters(100, -1*deg, 1.0*deg, 100, 0.0*deg,
+ 2.0*deg)
zplus = kvector_t(0.0, 0.0, 1.0)
simulation.setAnalyzerProperties(zplus, efficiency, 0.5)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setBeamPolarization(rho_beam)
simulation.setSample(multi_layer)
simulation.setBeamIntensity(1e9)
diff --git a/Tests/Functional/Python/PyCore/transform_CoreShellBox.py b/Tests/Functional/Python/PyCore/transform_CoreShellBox.py
index 549d1e7186c..11677442fae 100644
--- a/Tests/Functional/Python/PyCore/transform_CoreShellBox.py
+++ b/Tests/Functional/Python/PyCore/transform_CoreShellBox.py
@@ -119,7 +119,7 @@ class TransformCoreShellBoxTest(unittest.TestCase):
FormFactorBox(shell_length, shell_width, shell_height))
coreshell = ParticleCoreShell(
shell, core, kvector_t(0.0, 0.0, (shell_height - core_height)/2.0))
- coreshell.setRotation(RotationZ(90.0*degree))
+ coreshell.setRotation(RotationZ(90.0*deg))
coreshell.setPosition(
kvector_t(
0.0, 0.0, -layer_thickness/2.0 -
@@ -175,7 +175,7 @@ class TransformCoreShellBoxTest(unittest.TestCase):
FormFactorBox(shell_length, shell_width, shell_height))
coreshell = ParticleCoreShell(
shell, core, kvector_t(0.0, 0.0, (shell_height - core_height)/2.0))
- coreshell.setRotation(RotationY(90.*degree))
+ coreshell.setRotation(RotationY(90.*deg))
coreshell.setPosition(kvector_t(
0.0, 0.0,
-layer_thickness/2.0)) # center of coreshell in center of the layer
@@ -231,8 +231,8 @@ class TransformCoreShellBoxTest(unittest.TestCase):
FormFactorBox(shell_length, shell_width, shell_height))
coreshell = ParticleCoreShell(
shell, core, kvector_t(0.0, 0.0, (shell_height - core_height)/2.0))
- coreshell.setRotation(RotationZ(90.0*degree))
- coreshell.rotate(RotationY(90.0*degree))
+ coreshell.setRotation(RotationZ(90.0*deg))
+ coreshell.rotate(RotationY(90.0*deg))
# rotation changes reference point, which now coincide with center of the volume
coreshell.setPosition(kvector_t(
0.0, 0.0,
diff --git a/Tests/Functional/Python/PyCore/transform_cube.py b/Tests/Functional/Python/PyCore/transform_cube.py
index f2d76a6e7fa..6cd39d524b4 100644
--- a/Tests/Functional/Python/PyCore/transform_cube.py
+++ b/Tests/Functional/Python/PyCore/transform_cube.py
@@ -82,12 +82,12 @@ class RotationsCubeTest(unittest.TestCase):
data_to_test = [
# ff rot pos layout_rot layout_pos
(box, None, None, None, None), # reference
- (box, RotationZ(90.*degree), None, None, None), # rotating particle
- (box, RotationZ(-90.*degree), None, None, None),
- (box, RotationZ(180.*degree), None, None, None),
- (box, None, None, RotationZ(90.*degree),
+ (box, RotationZ(90.*deg), None, None, None), # rotating particle
+ (box, RotationZ(-90.*deg), None, None, None),
+ (box, RotationZ(180.*deg), None, None, None),
+ (box, None, None, RotationZ(90.*deg),
None), # rotating through layout
- (box, RotationZ(45.*degree), None, RotationZ(45.*degree),
+ (box, RotationZ(45.*deg), None, RotationZ(45.*deg),
None), # cumulative rotation
]
@@ -112,13 +112,13 @@ class RotationsCubeTest(unittest.TestCase):
data_to_test = [
# ff rot pos layout_rot layout_pos
(box, None, None, None, None), # reference
- (box, RotationY(90.*degree), kvector_t(0, 0, 5.0), None,
+ (box, RotationY(90.*deg), kvector_t(0, 0, 5.0), None,
None), # rotating and translating
- (box, None, None, RotationY(90.*degree),
+ (box, None, None, RotationY(90.*deg),
kvector_t(0, 0, 5.0)), # rotating and translating
- (box, RotationY(90.*degree), None, None,
+ (box, RotationY(90.*deg), None, None,
kvector_t(0, 0, 5.0)), # rotating and translating
- (box, RotationY(45.*degree), kvector_t(0, 0, 0.0), RotationY(45.*degree),
+ (box, RotationY(45.*deg), kvector_t(0, 0, 0.0), RotationY(45.*deg),
kvector_t(0, 0, 5.0)), # rotating and translating
]
@@ -143,13 +143,13 @@ class RotationsCubeTest(unittest.TestCase):
data_to_test = [
# ff rot pos layout_rot layout_pos
(box, None, None, None, None), # reference
- (box, RotationX(90.*degree), kvector_t(0, 0, 5.0), None,
+ (box, RotationX(90.*deg), kvector_t(0, 0, 5.0), None,
None), # rotating and translating
- (box, None, None, RotationX(90.*degree),
+ (box, None, None, RotationX(90.*deg),
kvector_t(0, 0, 5.0)), # rotating and translating
- (box, RotationX(90.*degree), None, None,
+ (box, RotationX(90.*deg), None, None,
kvector_t(0, 0, 5.0)), # rotating and translating
- (box, RotationX(45.*degree), kvector_t(0, 0, 0.0), RotationX(45.*degree),
+ (box, RotationX(45.*deg), kvector_t(0, 0, 0.0), RotationX(45.*deg),
kvector_t(0, 0, 5.0)), # rotating and translating
]
@@ -172,7 +172,7 @@ class RotationsCubeTest(unittest.TestCase):
data_to_test = [
# ff rot pos layout_rot layout_pos
(box, None, kvector_t(0, 0, -25.0), None, None), # reference
- (box, RotationX(90.*degree), kvector_t(0, 0, -20.0), None,
+ (box, RotationX(90.*deg), kvector_t(0, 0, -20.0), None,
None), # rotating and translating
]
diff --git a/Tests/Performance/Python/test_performance.py b/Tests/Performance/Python/test_performance.py
index ed50a45c496..1a77c10ffee 100755
--- a/Tests/Performance/Python/test_performance.py
+++ b/Tests/Performance/Python/test_performance.py
@@ -185,9 +185,9 @@ class CustomTest(FactoryTest):
"""
simulation = GISASSimulation()
simulation.getOptions().setNumberOfThreads(-1)
- simulation.setDetectorParameters(100, phi_min*degree, phi_max*degree, 100,
- alpha_min*degree, alpha_max*degree)
- simulation.setBeamParameters(1.0*angstrom, 0.2*degree, 0.0*degree)
+ simulation.setDetectorParameters(100, phi_min*deg, phi_max*deg, 100,
+ alpha_min*deg, alpha_max*deg)
+ simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
return simulation
--
GitLab