From c6aa348f8976c27e16d1e642d89d2ceb0bea79d6 Mon Sep 17 00:00:00 2001
From: Joseph Ramsay <joseph.ramsay@stfc.ac.uk>
Date: Fri, 6 Oct 2017 12:04:52 +0100
Subject: [PATCH] Re #20830 Fixed float format problems
---
docs/source/algorithms/SelectCellOfType-v1.rst | 9 +++++----
docs/source/algorithms/SelectCellWithForm-v1.rst | 8 ++++----
docs/source/algorithms/SliceMDHisto-v1.rst | 10 +++++-----
3 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/docs/source/algorithms/SelectCellOfType-v1.rst b/docs/source/algorithms/SelectCellOfType-v1.rst
index e166208a30a..dcff4e1ba83 100644
--- a/docs/source/algorithms/SelectCellOfType-v1.rst
+++ b/docs/source/algorithms/SelectCellOfType-v1.rst
@@ -51,11 +51,12 @@ Output:
.. testoutput:: ExSelectCellOfType
- Lattice before SelectCellOfType:
- 8.60581864273 11.935925461 11.9418127661 107.429088323 98.7529124665 98.9511934747
+ Lattice before SelectCellOfType:
+ 8.605818643 11.935925461 11.941812766 107.429088323 98.752912466 98.951193475
+
+ Lattice after SelectCellOfType:
+ 14.131051152 19.247332564 8.605818643 89.881170675 105.071333770 89.970386662
- Lattice after SelectCellOfType:
- 14.1310511523 19.247332564 8.60581864273 89.8811706749 105.07133377 89.970386662
.. categories::
diff --git a/docs/source/algorithms/SelectCellWithForm-v1.rst b/docs/source/algorithms/SelectCellWithForm-v1.rst
index bcc531e9785..691de2073cd 100644
--- a/docs/source/algorithms/SelectCellWithForm-v1.rst
+++ b/docs/source/algorithms/SelectCellWithForm-v1.rst
@@ -51,11 +51,11 @@ Output:
.. testoutput:: ExSelectCellWithForm
- Lattice before SelectCellWithForm:
- 8.60581864273 11.935925461 11.9418127661 107.429088323 98.7529124665 98.9511934747
+ Lattice before SelectCellWithForm:
+ 8.605818643 11.935925461 11.941812766 107.429088323 98.752912466 98.951193475
- Lattice after SelectCellWithForm:
- 14.1310511523 19.247332564 8.60581864273 89.8811706749 105.07133377 89.970386662
+ Lattice after SelectCellWithForm:
+ 14.131051152 19.247332564 8.605818643 89.881170675 105.071333770 89.970386662
.. categories::
diff --git a/docs/source/algorithms/SliceMDHisto-v1.rst b/docs/source/algorithms/SliceMDHisto-v1.rst
index 732bef4bd0c..9014403ae15 100644
--- a/docs/source/algorithms/SliceMDHisto-v1.rst
+++ b/docs/source/algorithms/SliceMDHisto-v1.rst
@@ -30,11 +30,11 @@ Usage
def outputMDDimensions(ws):
num_dims = ws.getNumDims()
- print "Name Bins Min Max"
+ print("Name Bins Min Max")
for dim_index in range(num_dims):
dim = ws.getDimension(dim_index)
- print "%s %i %.2f %.2f" % (dim.name,
- dim.getNBins(), dim.getMinimum(), dim.getMaximum())
+ print("{} {} {:.2f} {:.2f}".format(
+ dim.name, dim.getNBins(), dim.getMinimum(), dim.getMaximum()))
#create a test MD event workspace
mdew = CreateMDWorkspace(Dimensions=3, Extents=[-1,1,-5,5,-9,10],
@@ -46,13 +46,13 @@ Usage
AlignedDim1='B,-5,5,5',
AlignedDim2='C,-9,10,9')
- print "The original workspace"
+ print("The original workspace")
outputMDDimensions(wsHisto)
#The values in start and end are the Bin numbers(staring at 0) of the dimensions
wsOut = SliceMDHisto(wsHisto,Start=[1,2,0],End=[7,4,7])
- print "\nAfter Slicing"
+ print("\nAfter Slicing")
outputMDDimensions(wsOut)
--
GitLab