From b400c6a1afbc9968a749019343ee8d9c3a460afe Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Mon, 7 Dec 2020 08:23:51 +0100
Subject: [PATCH] Expand setBeamIntensity
---
Examples/Python/fit51_Basic/basic_fitting_tutorial.py | 2 +-
Examples/Python/fit51_Basic/consecutive_fitting.py | 2 +-
Examples/Python/fit51_Basic/minimizer_settings.py | 2 +-
Examples/Python/fit52_Advanced/find_background.py | 2 +-
Examples/Python/fit52_Advanced/fit_along_slices.py | 2 +-
Examples/Python/fit52_Advanced/fit_with_masks.py | 2 +-
Examples/Python/fit52_Advanced/multiple_datasets.py | 2 +-
.../Python/fit53_CustomObjective/custom_objective_function.py | 2 +-
Examples/Python/fit54_ExternalMinimizer/lmfit_basics.py | 2 +-
Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py | 2 +-
.../Python/fit55_SpecularIntro/RealLifeReflectometryFitting.py | 2 +-
Examples/Python/fit56_SpecularAdvanced/Honeycomb_fit.py | 2 +-
Examples/Python/fit56_SpecularAdvanced/Pt_layer_fit.py | 2 +-
Examples/Python/fit61_Galaxi/fit_galaxi_data.py | 2 +-
Examples/Python/sim02_Complexes/BiMaterialCylinders.py | 2 +-
Examples/Python/sim03_Structures/FindPeaks.py | 2 +-
Examples/Python/sim03_Structures/RectangularGrating.py | 2 +-
Examples/Python/sim04_Multilayers/CorrelatedRoughness.py | 2 +-
Examples/Python/sim04_Multilayers/GratingMC.py | 2 +-
Examples/Python/sim05_Magnetism/MagneticSpheres.py | 2 +-
Examples/Python/sim11_Device/ConstantBackground.py | 2 +-
Examples/Python/sim11_Device/OffSpecularSimulation.py | 2 +-
Examples/Python/sim11_Device/ResonatorOffSpecSetup.py | 2 +-
Examples/Python/sim23_SAS/PolarizedSANS.py | 2 +-
.../Python/sim31_Parameterization/AccessingSimulationResults.py | 2 +-
Tests/Functional/Python/PyCore/mesocrystal1.py | 2 +-
Tests/Functional/Python/PyCore/polmagcylinders1.py | 2 +-
Tests/Functional/Python/PyCore/polmagcylinders2.py | 2 +-
28 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/Examples/Python/fit51_Basic/basic_fitting_tutorial.py b/Examples/Python/fit51_Basic/basic_fitting_tutorial.py
index 7c24670e02c..0ae9626101e 100644
--- a/Examples/Python/fit51_Basic/basic_fitting_tutorial.py
+++ b/Examples/Python/fit51_Basic/basic_fitting_tutorial.py
@@ -50,7 +50,7 @@ def get_simulation(params):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit51_Basic/consecutive_fitting.py b/Examples/Python/fit51_Basic/consecutive_fitting.py
index 4be55737e24..59193cf7f5d 100644
--- a/Examples/Python/fit51_Basic/consecutive_fitting.py
+++ b/Examples/Python/fit51_Basic/consecutive_fitting.py
@@ -47,7 +47,7 @@ def get_simulation(params):
simulation.setDetectorParameters(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
2.0*deg)
simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit51_Basic/minimizer_settings.py b/Examples/Python/fit51_Basic/minimizer_settings.py
index 524c2907dd9..dfffad0b1fa 100644
--- a/Examples/Python/fit51_Basic/minimizer_settings.py
+++ b/Examples/Python/fit51_Basic/minimizer_settings.py
@@ -48,7 +48,7 @@ def get_simulation(params):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit52_Advanced/find_background.py b/Examples/Python/fit52_Advanced/find_background.py
index 4bd5ce029f8..001f8382bce 100644
--- a/Examples/Python/fit52_Advanced/find_background.py
+++ b/Examples/Python/fit52_Advanced/find_background.py
@@ -50,7 +50,7 @@ def get_simulation(params):
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)
- simulation.setBeamIntensity(1e12*scale)
+ simulation.beam().setIntensity(1e12*scale)
simulation.setBackground(ba.ConstantBackground(background))
simulation.setSample(get_sample(params))
diff --git a/Examples/Python/fit52_Advanced/fit_along_slices.py b/Examples/Python/fit52_Advanced/fit_along_slices.py
index 17c6e3b7a95..52e1fe7ad1c 100644
--- a/Examples/Python/fit52_Advanced/fit_along_slices.py
+++ b/Examples/Python/fit52_Advanced/fit_along_slices.py
@@ -45,7 +45,7 @@ def get_simulation(params, add_masks=True):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
if add_masks:
"""
diff --git a/Examples/Python/fit52_Advanced/fit_with_masks.py b/Examples/Python/fit52_Advanced/fit_with_masks.py
index 7491e37562b..21ddfa0975a 100644
--- a/Examples/Python/fit52_Advanced/fit_with_masks.py
+++ b/Examples/Python/fit52_Advanced/fit_with_masks.py
@@ -44,7 +44,7 @@ def get_simulation(params, add_masks=True):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
if add_masks:
diff --git a/Examples/Python/fit52_Advanced/multiple_datasets.py b/Examples/Python/fit52_Advanced/multiple_datasets.py
index ff95b47817b..96a02b7ca04 100644
--- a/Examples/Python/fit52_Advanced/multiple_datasets.py
+++ b/Examples/Python/fit52_Advanced/multiple_datasets.py
@@ -47,7 +47,7 @@ def get_simulation(params):
simulation.setDetectorParameters(50, -1.5*deg, 1.5*deg, 50, 0.0*deg,
2.0*deg)
simulation.setBeamParameters(1.0*angstrom, incident_angle, 0.0*deg)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit53_CustomObjective/custom_objective_function.py b/Examples/Python/fit53_CustomObjective/custom_objective_function.py
index daa8e8cb6de..c9d41a5d81f 100644
--- a/Examples/Python/fit53_CustomObjective/custom_objective_function.py
+++ b/Examples/Python/fit53_CustomObjective/custom_objective_function.py
@@ -75,7 +75,7 @@ def get_simulation(params):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit54_ExternalMinimizer/lmfit_basics.py b/Examples/Python/fit54_ExternalMinimizer/lmfit_basics.py
index 9c4ce77ef23..a2bd371deff 100644
--- a/Examples/Python/fit54_ExternalMinimizer/lmfit_basics.py
+++ b/Examples/Python/fit54_ExternalMinimizer/lmfit_basics.py
@@ -49,7 +49,7 @@ def get_simulation(params):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py b/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py
index 1c020d21151..83a6aac72ee 100644
--- a/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py
+++ b/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py
@@ -50,7 +50,7 @@ def get_simulation(params):
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)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.setSample(get_sample(params))
return simulation
diff --git a/Examples/Python/fit55_SpecularIntro/RealLifeReflectometryFitting.py b/Examples/Python/fit55_SpecularIntro/RealLifeReflectometryFitting.py
index c76879c427e..d0b061bdffe 100644
--- a/Examples/Python/fit55_SpecularIntro/RealLifeReflectometryFitting.py
+++ b/Examples/Python/fit55_SpecularIntro/RealLifeReflectometryFitting.py
@@ -100,7 +100,7 @@ def create_simulation(arg_dict, bin_start, bin_end):
simulation = ba.SpecularSimulation()
simulation.setScan(scan)
- simulation.setBeamIntensity(arg_dict["intensity"])
+ simulation.beam().setIntensity(arg_dict["intensity"])
return simulation
diff --git a/Examples/Python/fit56_SpecularAdvanced/Honeycomb_fit.py b/Examples/Python/fit56_SpecularAdvanced/Honeycomb_fit.py
index 2344575a1f8..e5977866c95 100644
--- a/Examples/Python/fit56_SpecularAdvanced/Honeycomb_fit.py
+++ b/Examples/Python/fit56_SpecularAdvanced/Honeycomb_fit.py
@@ -97,7 +97,7 @@ def get_simulation(q_axis, fitParams, sign, ms150=False):
simulation = ba.SpecularSimulation()
simulation.setScan(scan)
- simulation.setBeamIntensity(parameters["intensity"])
+ simulation.beam().setIntensity(parameters["intensity"])
if ms150:
sample = get_sample(parameters=parameters,
diff --git a/Examples/Python/fit56_SpecularAdvanced/Pt_layer_fit.py b/Examples/Python/fit56_SpecularAdvanced/Pt_layer_fit.py
index 93990f0eb6c..95ea478c3ac 100644
--- a/Examples/Python/fit56_SpecularAdvanced/Pt_layer_fit.py
+++ b/Examples/Python/fit56_SpecularAdvanced/Pt_layer_fit.py
@@ -67,7 +67,7 @@ def get_simulation(q_axis, parameters):
scan.setAbsoluteQResolution(distr, parameters["q_res/q"])
simulation = ba.SpecularSimulation()
- simulation.setBeamIntensity(parameters["intensity"])
+ simulation.beam().setIntensity(parameters["intensity"])
simulation.setScan(scan)
return simulation
diff --git a/Examples/Python/fit61_Galaxi/fit_galaxi_data.py b/Examples/Python/fit61_Galaxi/fit_galaxi_data.py
index 5bda0a44098..fb7d6fcd69e 100644
--- a/Examples/Python/fit61_Galaxi/fit_galaxi_data.py
+++ b/Examples/Python/fit61_Galaxi/fit_galaxi_data.py
@@ -37,7 +37,7 @@ def create_simulation(params):
simulation = ba.GISASSimulation()
simulation.setDetector(create_detector())
simulation.setBeamParameters(wavelength, alpha_i, 0.0)
- simulation.setBeamIntensity(1.2e7)
+ simulation.beam().setIntensity(1.2e7)
simulation.setRegionOfInterest(85.0, 70.0, 120.0, 92.)
simulation.addMask(ba.Rectangle(101.9, 82.1, 103.7, 85.2), True) # beamstop
diff --git a/Examples/Python/sim02_Complexes/BiMaterialCylinders.py b/Examples/Python/sim02_Complexes/BiMaterialCylinders.py
index d2c4b45a9bb..c99b9de98ba 100644
--- a/Examples/Python/sim02_Complexes/BiMaterialCylinders.py
+++ b/Examples/Python/sim02_Complexes/BiMaterialCylinders.py
@@ -86,7 +86,7 @@ def get_simulation():
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)
- simulation.setBeamIntensity(1.0e+08)
+ simulation.beam().setIntensity(1.0e+08)
return simulation
diff --git a/Examples/Python/sim03_Structures/FindPeaks.py b/Examples/Python/sim03_Structures/FindPeaks.py
index 8ec943f7112..73d5d3cc323 100644
--- a/Examples/Python/sim03_Structures/FindPeaks.py
+++ b/Examples/Python/sim03_Structures/FindPeaks.py
@@ -60,7 +60,7 @@ def get_simulation():
simulation.setDetectorParameters(200, -0.5*deg, 0.5*deg, 200, 0.0*deg,
0.6*deg)
simulation.setBeamParameters(1.34*angstrom, 0.4*deg, 0.0*deg)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.getOptions().setMonteCarloIntegration(True, 100)
return simulation
diff --git a/Examples/Python/sim03_Structures/RectangularGrating.py b/Examples/Python/sim03_Structures/RectangularGrating.py
index 2fde5c4bc88..da5b6733749 100644
--- a/Examples/Python/sim03_Structures/RectangularGrating.py
+++ b/Examples/Python/sim03_Structures/RectangularGrating.py
@@ -59,7 +59,7 @@ def get_simulation():
simulation.setDetectorParameters(200, -0.5*deg, 0.5*deg, 200, 0.0*deg,
0.6*deg)
simulation.setBeamParameters(1.34*angstrom, 0.4*deg, 0.0*deg)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.getOptions().setMonteCarloIntegration(True, 100)
return simulation
diff --git a/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py b/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py
index b700ee46b85..a32410384e7 100644
--- a/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py
+++ b/Examples/Python/sim04_Multilayers/CorrelatedRoughness.py
@@ -52,7 +52,7 @@ def get_simulation():
simulation.setDetectorParameters(200, -0.5*deg, 0.5*deg, 200, 0.0*deg,
1.0*deg)
simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
- simulation.setBeamIntensity(5e11)
+ simulation.beam().setIntensity(5e11)
return simulation
diff --git a/Examples/Python/sim04_Multilayers/GratingMC.py b/Examples/Python/sim04_Multilayers/GratingMC.py
index c682f389350..91cb58dfa3f 100644
--- a/Examples/Python/sim04_Multilayers/GratingMC.py
+++ b/Examples/Python/sim04_Multilayers/GratingMC.py
@@ -60,7 +60,7 @@ def get_simulation():
simulation.setDetectorParameters(200, -0.5*deg, 0.5*deg, 200, 0.0*deg,
0.6*deg)
simulation.setBeamParameters(1.34*angstrom, 0.4*deg, 0.0*deg)
- simulation.setBeamIntensity(1e+08)
+ simulation.beam().setIntensity(1e+08)
simulation.getOptions().setMonteCarloIntegration(True, 100)
return simulation
diff --git a/Examples/Python/sim05_Magnetism/MagneticSpheres.py b/Examples/Python/sim05_Magnetism/MagneticSpheres.py
index 1b6277ea0a8..171baed9ac7 100644
--- a/Examples/Python/sim05_Magnetism/MagneticSpheres.py
+++ b/Examples/Python/sim05_Magnetism/MagneticSpheres.py
@@ -55,7 +55,7 @@ def get_simulation():
simulation.setDetectorParameters(200, -3.0*deg, 3.0*deg, 200, 0.0*deg,
6.0*deg)
simulation.setBeamParameters(1.*angstrom, 0.5*deg, 0.0*deg)
- simulation.setBeamIntensity(1e12)
+ simulation.beam().setIntensity(1e12)
analyzer_dir = ba.kvector_t(0.0, 0.0, -1.0)
beampol = ba.kvector_t(0.0, 0.0, 1.0)
diff --git a/Examples/Python/sim11_Device/ConstantBackground.py b/Examples/Python/sim11_Device/ConstantBackground.py
index 75935b4b9c9..a1e5e980907 100644
--- a/Examples/Python/sim11_Device/ConstantBackground.py
+++ b/Examples/Python/sim11_Device/ConstantBackground.py
@@ -48,7 +48,7 @@ def get_simulation():
simulation.setDetectorParameters(100, 0.0*deg, 2.0*deg, 100, 0.0*deg,
2.0*deg)
simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
- simulation.setBeamIntensity(1e6)
+ simulation.beam().setIntensity(1e6)
bg = ba.ConstantBackground(1e3)
simulation.setBackground(bg)
return simulation
diff --git a/Examples/Python/sim11_Device/OffSpecularSimulation.py b/Examples/Python/sim11_Device/OffSpecularSimulation.py
index fae853ac2cf..7784246f726 100644
--- a/Examples/Python/sim11_Device/OffSpecularSimulation.py
+++ b/Examples/Python/sim11_Device/OffSpecularSimulation.py
@@ -64,7 +64,7 @@ def get_simulation():
alpha_i_axis = ba.FixedBinAxis("alpha_i", 200, alpha_i_min*deg,
alpha_i_max*deg)
simulation.setBeamParameters(1.0*angstrom, alpha_i_axis, 0.0*deg)
- simulation.setBeamIntensity(1e9)
+ simulation.beam().setIntensity(1e9)
return simulation
diff --git a/Examples/Python/sim11_Device/ResonatorOffSpecSetup.py b/Examples/Python/sim11_Device/ResonatorOffSpecSetup.py
index 69de44dd35c..2ea4b1cc604 100644
--- a/Examples/Python/sim11_Device/ResonatorOffSpecSetup.py
+++ b/Examples/Python/sim11_Device/ResonatorOffSpecSetup.py
@@ -72,7 +72,7 @@ def get_offspec_simulation():
alpha_i_max)
simulation.setBeamParameters(5.0*angstrom, alpha_i_axis, 0.0)
- simulation.setBeamIntensity(1e9)
+ simulation.beam().setIntensity(1e9)
simulation.getOptions().setIncludeSpecular(True)
# define detector resolution function with smearing depending on bin size
diff --git a/Examples/Python/sim23_SAS/PolarizedSANS.py b/Examples/Python/sim23_SAS/PolarizedSANS.py
index eff2352864e..5c7f8a6f7c6 100644
--- a/Examples/Python/sim23_SAS/PolarizedSANS.py
+++ b/Examples/Python/sim23_SAS/PolarizedSANS.py
@@ -63,7 +63,7 @@ def get_simulation():
# Defining beam parameters
simulation.setBeamParameters(0.5*nm, 0.0*deg, 0.0*deg)
- simulation.setBeamIntensity(1e12)
+ simulation.beam().setIntensity(1e12)
# Defining beam polarization and polarization analysis for spin-flip channel
analyzer_dir = kvector_t(0.0, 0.0, -1.0)
diff --git a/Examples/Python/sim31_Parameterization/AccessingSimulationResults.py b/Examples/Python/sim31_Parameterization/AccessingSimulationResults.py
index 5dd69b16e2e..b1e8ad350cd 100644
--- a/Examples/Python/sim31_Parameterization/AccessingSimulationResults.py
+++ b/Examples/Python/sim31_Parameterization/AccessingSimulationResults.py
@@ -53,7 +53,7 @@ def get_simulation():
simulation.setDetectorParameters(201, -2.0*deg, 2.0*deg, 201, 0.0*deg,
2.0*deg)
simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
- simulation.setBeamIntensity(1e+05)
+ simulation.beam().setIntensity(1e+05)
return simulation
diff --git a/Tests/Functional/Python/PyCore/mesocrystal1.py b/Tests/Functional/Python/PyCore/mesocrystal1.py
index 6e1bbc7b160..b4c5de2b1cc 100644
--- a/Tests/Functional/Python/PyCore/mesocrystal1.py
+++ b/Tests/Functional/Python/PyCore/mesocrystal1.py
@@ -176,7 +176,7 @@ def runTest():
def createSimulation():
simulation = GISASSimulation()
simulation.setBeamParameters(1.77*angstrom, 0.4*deg, 0.0*deg)
- simulation.setBeamIntensity(5.0090e+12)
+ simulation.beam().setIntensity(5.0090e+12)
simulation.setDetectorParameters(50, 0.2*deg, 2.5*deg, 50, 0.0*deg, 2.5*deg)
return simulation
diff --git a/Tests/Functional/Python/PyCore/polmagcylinders1.py b/Tests/Functional/Python/PyCore/polmagcylinders1.py
index 6159e4a58ba..81646345cde 100644
--- a/Tests/Functional/Python/PyCore/polmagcylinders1.py
+++ b/Tests/Functional/Python/PyCore/polmagcylinders1.py
@@ -40,7 +40,7 @@ def runSimulation():
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.beam().setIntensity(1e2)
simulation.runSimulation()
## intensity data
return simulation.result()
diff --git a/Tests/Functional/Python/PyCore/polmagcylinders2.py b/Tests/Functional/Python/PyCore/polmagcylinders2.py
index 76189b4f1e9..3e969efa3c3 100644
--- a/Tests/Functional/Python/PyCore/polmagcylinders2.py
+++ b/Tests/Functional/Python/PyCore/polmagcylinders2.py
@@ -47,7 +47,7 @@ def getSimulationIntensity(rho_beam, efficiency):
simulation.setBeamParameters(1.0*angstrom, 0.2*deg, 0.0*deg)
simulation.setBeamPolarization(rho_beam)
simulation.setSample(multi_layer)
- simulation.setBeamIntensity(1e9)
+ simulation.beam().setIntensity(1e9)
simulation.runSimulation()
print("- - simulation done", flush=True)
return simulation.result()
--
GitLab