Changeset 2347 for trunk/imports/G2pwd_CIF.py

Timestamp:

Jun 27, 2016 9:48:51 AM (7 years ago)

Author:

vondreele

Message:

implement Steven Weigand's fixes for Pilatus 'I' for 'L'
do a 'fix' for powderCif files with value(esd) for powder profile points
add a couple of comments for tutorial stuff

File:

• trunk/imports/G2pwd_CIF.py (modified) (2 diffs)

trunk/imports/G2pwd_CIF.py

@@ -261 +261 @@
             ycf = ych[yi]
             vl = []
+            v2 = []
             for val in cf[blk].get(ycf,'?'):
                 v,e = cif.get_number_with_esd(val)
                 if v is None: # not parsed
                     vl.append(np.NaN)
+                    v2.append(np.NaN)
                 else:
                     vl.append(v)
+                    v2.append(max(e,1.0))
             y = np.array(vl)
+            w = 1./np.array(v2)**2
             # weights
             if sui == -1:
@@ -300 +304 @@
                         else:
                             vl.append(1./(e*e))
-            w = np.array(vl)
+#            w = np.array(vl)
             # intensity modification factor
             if modi >= 1: