workaround fabio changes

FABLE-3DXRD · Jun 3, 2019 · b869d14 · b869d14
1 parent 13f0fdd
commit b869d14
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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',