From b869d14cf08a7b06785ab185f2fdfa2dbf3ceb64 Mon Sep 17 00:00:00 2001 From: Jon Wright Date: Mon, 3 Jun 2019 22:35:05 +0200 Subject: [PATCH] workaround fabio changes --- polyxsim/make_image.py | 10 +++++----- polyxsim/make_imagestack.py | 10 +++++----- setup.py | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/polyxsim/make_image.py b/polyxsim/make_image.py index 4411499..b04fca2 100644 --- a/polyxsim/make_image.py +++ b/polyxsim/make_image.py @@ -208,13 +208,13 @@ def make_image(self,frame_number=None): def write_edf(self,framenumber,frame): e=edfimage.edfimage() e.data=frame - e.dim2,e.dim1=frame.shape + edim2,edim1=frame.shape e.header = {} e.header['origin']='PolyXSim' - e.header['Dim_1']=e.dim1 - e.header['Dim_2']=e.dim2 - e.header['col_end']=e.dim1-1 - e.header['row_end']=e.dim2-1 + e.header['Dim_1']=edim1 + e.header['Dim_2']=edim2 + e.header['col_end']=edim1-1 + e.header['row_end']=edim2-1 e.header['DataType']='UnsignedShort' e.header['Image']=1 e.header['ByteOrder']='Low' diff --git a/polyxsim/make_imagestack.py b/polyxsim/make_imagestack.py index aee8979..b032fef 100644 --- a/polyxsim/make_imagestack.py +++ b/polyxsim/make_imagestack.py @@ -294,13 +294,13 @@ def correct_image(self): def write_edf(self,framenumber,frame): e=edfimage.edfimage() e.data=frame - e.dim2,e.dim1=frame.shape + edim2,edim1=frame.shape e.header = {} e.header['origin']='PolyXSim' - e.header['Dim_1']=e.dim1 - e.header['Dim_2']=e.dim2 - e.header['col_end']=e.dim1-1 - e.header['row_end']=e.dim2-1 + e.header['Dim_1']=edim1 + e.header['Dim_2']=edim2 + e.header['col_end']=edim1-1 + e.header['row_end']=edim2-1 e.header['DataType']='UnsignedShort' e.header['Image']=1 e.header['ByteOrder']='Low' diff --git a/setup.py b/setup.py index 7f54b31..0d6000a 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name='PolyXSim', - version='1.1.0', + version='1.1.1', description='Simulation of diffraction images', license='GPL', maintainer='Henning Osholm Soerensen and Jette Oddershede',