From fd6a282a53be8eac5168c999649cad8c77d32ea8 Mon Sep 17 00:00:00 2001
From: jmfisher <j.fisher@jz-juelich.de>
Date: Wed, 23 Mar 2016 16:54:28 +0100
Subject: [PATCH] updated scripts for python 3 compatibility
---
.../SampleParametersIntro.py | 1 +
.../fitting/ex04_FitScaleAndShift/FitScaleAndShift.py | 7 ++++---
.../python/fitting/ex05_FitWithMasks/FitWithMasks.py | 7 ++++---
.../ex06_FitStrategies/FitStrategyAdjustMinimizer.py | 7 ++++---
.../SimultaneousFitOfTwoDatasets.py | 7 ++++---
Examples/python/utils/show2d.py | 9 +++++----
Examples/python/utils/show2d_root.py | 11 ++++++-----
7 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py b/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py
index e859cf29acc..bb6b48a7cf4 100644
--- a/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py
+++ b/Examples/python/fitting/ex01_SampleParametersIntro/SampleParametersIntro.py
@@ -2,6 +2,7 @@
Working with sample parameters
"""
+from __future__ import print_function
import matplotlib
from matplotlib import pyplot as plt
from bornagain import *
diff --git a/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py b/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py
index 8f3a864986c..f3ffb1bdf4d 100644
--- a/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py
+++ b/Examples/python/fitting/ex04_FitScaleAndShift/FitScaleAndShift.py
@@ -5,6 +5,7 @@ Real data contains some "unknown" background and scale factors.
In the fit we are trying to find cylinder radius and height, scale and background factors.
"""
+from __future__ import print_function
import numpy
import matplotlib
import math
@@ -111,11 +112,11 @@ def run_fitting():
# running fit
fit_suite.runFit()
- print "Fitting completed."
- print "chi2:", fit_suite.getMinimizer().getMinValue()
+ print("Fitting completed.")
+ print("chi2:", fit_suite.getMinimizer().getMinValue())
fitpars = fit_suite.getFitParameters()
for i in range(0, fitpars.size()):
- print fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError()
+ print(fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError())
if __name__ == '__main__':
diff --git a/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py b/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py
index 21f0f5f7e48..902a795d874 100644
--- a/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py
+++ b/Examples/python/fitting/ex05_FitWithMasks/FitWithMasks.py
@@ -2,6 +2,7 @@
Fitting example: fit with masks
"""
+from __future__ import print_function
from matplotlib import pyplot as plt
import math
import random
@@ -132,12 +133,12 @@ def run_fitting():
# running fit
fit_suite.runFit()
- print "Fitting completed."
+ print("Fitting completed.")
fit_suite.printResults()
- print "chi2:", fit_suite.getChi2()
+ print("chi2:", fit_suite.getChi2())
fitpars = fit_suite.getFitParameters()
for i in range(0, fitpars.size()):
- print fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError()
+ print(fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError())
if __name__ == '__main__':
diff --git a/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py b/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py
index 5c4a3cac980..30bcfd80c62 100644
--- a/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py
+++ b/Examples/python/fitting/ex06_FitStrategies/FitStrategyAdjustMinimizer.py
@@ -7,6 +7,7 @@ After it is done, the second Minuit2 minimizer will continue to find the precise
found on previous step.
"""
+from __future__ import print_function
import numpy
import matplotlib
import math
@@ -110,11 +111,11 @@ def run_fitting():
# running fit
fit_suite.runFit()
- print "Fitting completed."
- print "chi2:", fit_suite.getChi2()
+ print("Fitting completed.")
+ print("chi2:", fit_suite.getChi2())
fitpars = fit_suite.getFitParameters()
for i in range(0, fitpars.size()):
- print fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError()
+ print(fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError())
if __name__ == '__main__':
diff --git a/Examples/python/fitting/ex08_SimultaneousFitOfTwoDatasets/SimultaneousFitOfTwoDatasets.py b/Examples/python/fitting/ex08_SimultaneousFitOfTwoDatasets/SimultaneousFitOfTwoDatasets.py
index e6afe829273..077a3c449f9 100644
--- a/Examples/python/fitting/ex08_SimultaneousFitOfTwoDatasets/SimultaneousFitOfTwoDatasets.py
+++ b/Examples/python/fitting/ex08_SimultaneousFitOfTwoDatasets/SimultaneousFitOfTwoDatasets.py
@@ -2,6 +2,7 @@
Fitting example: demonstrates how to fit two datasets simultaneously.
"""
+from __future__ import print_function
import matplotlib
from matplotlib import pyplot as plt
import matplotlib.gridspec as gridspec
@@ -155,11 +156,11 @@ def run_fitting():
# running fit
fit_suite.runFit()
- print "Fitting completed."
- print "chi2:", fit_suite.getChi2()
+ print("Fitting completed.")
+ print("chi2:", fit_suite.getChi2())
fitpars = fit_suite.getFitParameters()
for i in range(0, fitpars.size()):
- print fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError()
+ print(fitpars[i].getName(), fitpars[i].getValue(), fitpars[i].getError())
if __name__ == '__main__':
diff --git a/Examples/python/utils/show2d.py b/Examples/python/utils/show2d.py
index 54ee913b416..f2156e1ef41 100755
--- a/Examples/python/utils/show2d.py
+++ b/Examples/python/utils/show2d.py
@@ -2,6 +2,7 @@
# Draws two dimensional numpy array using matplotlib
# Usage: python show2d.py file_name
+from __future__ import print_function
from pylab import *
from matplotlib.colors import LogNorm
import argparse
@@ -67,10 +68,10 @@ if __name__ == '__main__':
print( "loading..." )
a=np.loadtxt(filename)
file_no_prefix = os.path.splitext(os.path.basename(filename))[0]
- print 'Filename: ', file_no_prefix
- print 'Data shape: ', a.shape
- print 'Minimum value of data: ', a.flatten().min()
- print 'Maximum value of data: ', a.flatten().max()
+ print('Filename: ', file_no_prefix)
+ print('Data shape: ', a.shape)
+ print('Minimum value of data: ', a.flatten().min())
+ print('Maximum value of data: ', a.flatten().max())
PlotNumpyArray(a, zmin, zmax)
diff --git a/Examples/python/utils/show2d_root.py b/Examples/python/utils/show2d_root.py
index f54337ab038..cb3d1dbaf05 100755
--- a/Examples/python/utils/show2d_root.py
+++ b/Examples/python/utils/show2d_root.py
@@ -2,6 +2,7 @@
# Draws two dimensional numpy array using ROOT
# Usage: python show2d.py file_name
+from __future__ import print_function
import argparse
import os
import numpy
@@ -56,11 +57,11 @@ if __name__ == '__main__':
print( "loading..." )
a=np.loadtxt(filename)
file_no_prefix = os.path.splitext(os.path.basename(filename))[0]
- print 'Filename: ', file_no_prefix
- print 'Data shape: ', a.shape
- print 'Minimum value of data: ', a.flatten().min()
- print 'Maximum value of data: ', a.flatten().max()
+ print('Filename: ', file_no_prefix)
+ print('Data shape: ', a.shape)
+ print('Minimum value of data: ', a.flatten().min())
+ print('Maximum value of data: ', a.flatten().max())
PlotNumpyArrayWithROOT(a, zmin, zmax)
-
\ No newline at end of file
+
--
GitLab