From 6bb59fe27268d7c17a91231ce1db468264683fcf Mon Sep 17 00:00:00 2001
From: "Joachim Wuttke (h)" <j.wuttke@fz-juelich.de>
Date: Thu, 19 Nov 2020 15:48:20 +0100
Subject: [PATCH] corr Py line lengths
---
.../Python/fit54_ExternalMinimizer/lmfit_with_plotting.py | 3 ++-
Examples/Python/fit61_Galaxi/fit_galaxi_data.py | 2 +-
Examples/Python/utils/plot_intensity_data_diff.py | 8 +++++---
Examples/Python/utils/show2d.py | 2 +-
4 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py b/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py
index b08c02e7d5a..fc9514b085e 100644
--- a/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py
+++ b/Examples/Python/fit54_ExternalMinimizer/lmfit_with_plotting.py
@@ -103,7 +103,8 @@ def run_fitting():
params.add('length', value=10*nm, min=8*nm, max=14*nm)
plotter = Plotter(fit_objective)
- result = lmfit.minimize(fit_objective.evaluate_residuals, params, iter_cb=plotter)
+ result = lmfit.minimize(
+ fit_objective.evaluate_residuals, params, iter_cb=plotter)
fit_objective.finalize(result)
result.params.pretty_print()
diff --git a/Examples/Python/fit61_Galaxi/fit_galaxi_data.py b/Examples/Python/fit61_Galaxi/fit_galaxi_data.py
index a60048f30cb..f02b85a6384 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.setBeamParameters(wavelength, alpha_i, 0.0)
simulation.setBeamIntensity(1.2e7)
simulation.setRegionOfInterest(85.0, 70.0, 120.0, 92.)
- simulation.addMask(ba.Rectangle(101.9, 82.1, 103.7, 85.2), True) # mask on reflected beam
+ simulation.addMask(ba.Rectangle(101.9, 82.1, 103.7, 85.2), True) # beamstop
sample_builder = SampleBuilder()
sample = sample_builder.create_sample(params)
diff --git a/Examples/Python/utils/plot_intensity_data_diff.py b/Examples/Python/utils/plot_intensity_data_diff.py
index 0ed169f832d..d79dd4ce5c1 100755
--- a/Examples/Python/utils/plot_intensity_data_diff.py
+++ b/Examples/Python/utils/plot_intensity_data_diff.py
@@ -1,7 +1,7 @@
#!/usr/bin/env python3
'''
Plots intensity data difference stored in BornAgain "*.int" or "*.int.gz" format
-Usage: python plot_intensity_data_diff.py intensity_reference.int.gz intensity_other.int.gz
+Usage: python plot_intensity_data_diff.py reference.int.gz new.int.gz
'''
import numpy as np
@@ -20,8 +20,10 @@ def plot_intensity_data_diff(filename1, filename2):
rank = intensity_ref.rank()
if rank == 2:
pid.plot_raw_data_2d(data,
- [intensity_ref.getXmin() / ba.deg, intensity_ref.getXmax() / ba.deg,
- intensity_ref.getYmin() / ba.deg, intensity_ref.getYmax() / ba.deg],
+ [intensity_ref.getXmin() / ba.deg,
+ intensity_ref.getXmax() / ba.deg,
+ intensity_ref.getYmin() / ba.deg,
+ intensity_ref.getYmax() / ba.deg],
data.max())
elif rank == 1:
axis_values = np.asarray(intensity_ref.xAxis().binCenters()) / ba.deg
diff --git a/Examples/Python/utils/show2d.py b/Examples/Python/utils/show2d.py
index 3ff7cc93707..73a3d4ec22b 100755
--- a/Examples/Python/utils/show2d.py
+++ b/Examples/Python/utils/show2d.py
@@ -27,7 +27,7 @@ def PlotNumpyArray(a, zmin = 1, zmax = None):
plt.xlabel(r'$\phi_f$', fontsize=20)
plt.ylabel(r'$\alpha_f$', fontsize=20)
# Use one of the predefined colormaps or the above defined 'blue_cmap':
- im=plt.imshow(dataarray, norm=LogNorm(), vmax=zmax, cmap=cm.jet) #, interpolation='none')
+ im=plt.imshow(dataarray, norm=LogNorm(), vmax=zmax, cmap=cm.jet)
plt.gca().axes.get_xaxis().set_ticks([])
plt.gca().axes.get_yaxis().set_ticks([])
plt.colorbar(im)
--
GitLab