Changeset 4886

Timestamp:

Apr 19, 2021 3:07:02 PM (3 years ago)

Author:

vondreele

Message:

fix reference to masked arrays x,yobs....

File:

• trunk/exports/G2export_CIF.py (modified) (3 diffs)

trunk/exports/G2export_CIF.py

@@ -1441 +1441 @@
                 return out.rstrip('.')  # and decimal place when not needed
             except TypeError:
+                print(val)
                 return '.'
+            
         def WriteReflStat(refcount,hklmin,hklmax,dmin,dmax,nRefSets=1):
             'Write reflection statistics'
@@ -1719 +1721 @@
                 print('DEBUG: skipping profile list')
             else:
-                for x,yobs,yw,ycalc,ybkg in zip(histblk['Data'][0],
-                                                histblk['Data'][1],
-                                                histblk['Data'][2],
-                                                histblk['Data'][3],
-                                                histblk['Data'][4]):
+                for x,yobs,yw,ycalc,ybkg in zip(histblk['Data'][0].data,        #get the data from these masked arrays
+                                                histblk['Data'][1].data,
+                                                histblk['Data'][2].data,
+                                                histblk['Data'][3].data,
+                                                histblk['Data'][4].data):
                     if lowlim <= x <= highlim:
                         pass
@@ -1732 +1734 @@
                         s = ""
                     elif zero:
-                        s = PutInCol(G2mth.ValEsd(x-zero,-0.00009),10)
+                        s = PutInCol(G2mth.ValEsd(x.data-zero,-0.00009),10)
                     else:
-                        s = PutInCol(G2mth.ValEsd(x,-0.00009),10)
+                        s = PutInCol(G2mth.ValEsd(x.data,-0.00009),10)
                     s += PutInCol(Yfmt(ndec,yobs),12)
                     s += PutInCol(Yfmt(ndec,ycalc),12)