Changeset 2347

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

Location:

trunk

Files:

• GSASIIctrls.py (modified) (2 diffs)
• GSASIIpath.py (modified) (1 diff)
• ReadMarCCDFrame.py (modified) (1 diff)
• imports/G2img_1TIF.py (modified) (3 diffs)
• imports/G2pwd_CIF.py (modified) (2 diffs)

trunk/GSASIIctrls.py

@@ -4113 +4113 @@
                 wx.EndBusyCursor()
                 raise Exception
-        if not GSASIIpath.svnInstallDir(baseURL+"/MT",fullpath):
+        if not GSASIIpath.svnInstallDir(baseURL+"/MT",fullpath):    #this could load specific requested tutorial directory
             wx.EndBusyCursor()
             print("Problem transferring empty directory from web")
@@ -4151 +4151 @@
         if not os.path.exists(pth):
             try:
-                os.makedirs(pth)
+                os.makedirs(pth)    #failing for no obvious reason
             except OSError:
                 msg = 'The selected directory is not valid.\n\t'

trunk/GSASIIpath.py

@@ -444 +444 @@
     print("Loading files from "+URL)
     s = subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE)
-    out,err = s.communicate()
+    out,err = s.communicate()   #this fails too easily
     if err:
         print(60*"=")

trunk/ReadMarCCDFrame.py

@@ -284 +284 @@
         self.TIFFresolutionUnit = IFD[296][2][0] # 3 = centimeter
         self.byteDepth = self.TIFFbitDepth/8
-        self.arrayTypeCode = ['','B','H','L'][self.byteDepth]
+        self.arrayTypeCode = ['','B','H','I','I'][self.byteDepth]
         # MarCCD specific header info
         File.seek(IFD[34710][2][0])

trunk/imports/G2img_1TIF.py

@@ -164 +164 @@
 # extract resonable distance from header
         distance = (marFrame.startXtalToDetector+marFrame.endXtalToDetector)*5e-4
-        distance = (distance <= 0) and marFrame.xtalToDetector*1e-3 or distance
+        distance = (distance <= marFrame.startXtalToDetector*5e-4) and marFrame.xtalToDetector*1e-3 or distance
         distance = (distance <= 0) and None or distance
 # extract resonable center from header
@@ -197 +197 @@
             File.seek(4096)
             print 'Read Pilatus tiff file: ',filename
-            image = ar.array('L',File.read(4*Npix))
+            image = ar.array('I',File.read(4*Npix))
             image = np.array(np.asarray(image),dtype=np.int32)
         else:
@@ -211 +211 @@
                 File.seek(8)
                 print 'Read CHESS-detector tiff file: ',filename
-                image = np.array(ar.array('L',File.read(4*Npix)),dtype=np.int32)
+                image = np.array(ar.array('I',File.read(4*Npix)),dtype=np.int32)
     elif 270 in IFD:
         File.seek(IFD[270][2][0])

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: