Changeset 2284

Timestamp:

May 20, 2016 12:37:52 PM (6 years ago)

Author:

vondreele

Message:

update binwin64 (probably no different from previous one)
add Stacking Fault-III to tutorial list
fixup HDF5 importer for images - now recovers wavelength, distance, pixel size, etc.
fix float/integer incompatibility in Flat Bkg values
enable/disable if calibrant/nocalibrant for both Calibrate & Recalibrate
fix a float/int error in mouse positioning on image

Location:

trunk

Files:

• GSASIIctrls.py (modified) (1 diff)
• GSASIIimage.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (1 diff)
• binwin64-2.7/fellipse.pyd (modified) (previous)
• binwin64-2.7/histogram2d.pyd (modified) (previous)
• binwin64-2.7/histosigma2d.pyd (modified) (previous)
• binwin64-2.7/pack_f.pyd (modified) (previous)
• binwin64-2.7/polymask.pyd (modified) (previous)
• binwin64-2.7/pydiffax.pyd (modified) (previous)
• binwin64-2.7/pypowder.pyd (modified) (previous)
• binwin64-2.7/pyspg.pyd (modified) (previous)
• binwin64-2.7/pytexture.pyd (modified) (previous)
• imports/G2img_HDF5.py (modified) (4 diffs)

trunk/GSASIIctrls.py

@@ -3862 +3862 @@
         'Stacking fault simulations for diamond'],
     ['StackingFaults-II', 'StackingFaults-II', 'Stacking Faults II.htm', 
-        'Stacking fault simulations for kaolinite'],
+        'Stacking fault simulations for Keokuk kaolinite'],
+    ['StackingFaults-III', 'StackingFaults-III', 'Stacking Faults-III.htm', 
+        'Stacking fault simulations for Georgia kaolinite'],
         
     ['CFXraySingleCrystal','CFXraySingleCrystal','CFSingleCrystal.htm',

trunk/GSASIIimage.py

@@ -582 +582 @@
         ellipse = GetEllipse(H[3],data)
         data['ellipses'].append(copy.deepcopy(ellipse+('b',)))    
-    print 'calibration time = ',time.time()-time0
+    print 'calibration time = %.3f'%(time.time()-time0)
     G2plt.PlotImage(G2frame,newImage=True)        
     return True
@@ -794 +794 @@
         ellipse = GetEllipse(H[3],data)
         data['ellipses'].append(copy.deepcopy(ellipse+('b',)))
-    print 'calibration time = ',time.time()-time0
+    print 'calibration time = %.3f'%(time.time()-time0)
     G2plt.PlotImage(G2frame,newImage=True)        
     return True

trunk/GSASIIimgGUI.py

@@ -166 +166 @@
             
     def OnCalibrate(event):
-        if not data.get('calibrant'):
-            G2G.G2MessageBox(G2frame,'A calibrant must first be selected')
         G2frame.dataFrame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick, RB on point to delete else RB to finish')
         G2frame.ifGetRing = True
@@ -825 +823 @@
                 pass
             flatbkg.SetValue("%.0f"%(data['Flat Bkg']))    
-            G2frame.ImageZ += (oldFlat-data['Flat Bkg'])
+            G2frame.ImageZ += int(oldFlat-data['Flat Bkg'])
             ResetThresholds()
             G2plt.PlotExposedImage(G2frame,event=event)
@@ -890 +888 @@
                 
         def OnNewCalibrant(event):
-            data['calibrant'] = calSel.GetValue()
-            data['calibskip'] = calFile.Calibrants[data['calibrant']][3]
-            limits = calFile.Calibrants[data['calibrant']][4]
-            data['calibdmin'],data['pixLimit'],data['cutoff'] = limits
-            pixLimit.SetValue(str(limits[1]))
-            cutOff.SetValue('%.1f'%(limits[2]))
-            calibSkip.SetValue(str(data['calibskip']))
-            calibDmin.SetValue('%.1f'%(limits[0]))
+            data['calibrant'] = calSel.GetValue().strip()
+            if data['calibrant']:
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=True)
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=True)
+                data['calibskip'] = calFile.Calibrants[data['calibrant']][3]
+                limits = calFile.Calibrants[data['calibrant']][4]
+                data['calibdmin'],data['pixLimit'],data['cutoff'] = limits
+                pixLimit.SetValue(str(limits[1]))
+                cutOff.SetValue('%.1f'%(limits[2]))
+                calibSkip.SetValue(str(data['calibskip']))
+                calibDmin.SetValue('%.1f'%(limits[0]))
+            else:
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)
+                G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=False)
             
         def OnCalibSkip(event):
@@ -1084 +1088 @@
     if data.get('calibrant'):
         G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=True)
+        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=True)
     else:
         G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMRECALIBRATE,enable=False)
+        G2frame.dataFrame.ImageEdit.Enable(id=G2gd.wxID_IMCALIBRATE,enable=False)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrate, id=G2gd.wxID_IMINTEGRATE)
     G2frame.dataFrame.Bind(wx.EVT_MENU, OnIntegrateAll, id=G2gd.wxID_INTEGRATEALL)

trunk/GSASIIplot.py

@@ -3946 +3946 @@
                 xpos = event.xdata
                 ypos = event.ydata
-                xpix = xpos*scalex
-                ypix = ypos*scaley
+                xpix = int(xpos*scalex)
+                ypix = int(ypos*scaley)
                 Int = 0
                 if (0 <= xpix <= sizexy[0]) and (0 <= ypix <= sizexy[1]):

trunk/imports/G2img_HDF5.py

@@ -65 +65 @@
             if not self.buffer.get('init'):
                 self.buffer['init'] = True
-                self.visit(fp)
-            self.Comments,self.Data,self.Npix,self.Image = self.readDataset(fp,imagenum)
+                self.Comments = self.visit(fp)
+            self.Data,self.Npix,self.Image = self.readDataset(fp,imagenum)
             if self.Npix == 0 or not self.Comments:
                 return False
@@ -86 +86 @@
         ''' 
         datakeyword = 'data'
+        head = []
         def func(name, dset):
             if not hasattr(dset,'shape'): return # not array, can't be image
             if isinstance(dset, h5py.Dataset):
+                if len(dset.shape) < 2:
+                    head.append('%s: %s'%(dset.name,str(dset[()][0])))
                 if dset.name.endswith(datakeyword):
                     dims = dset.shape
@@ -99 +102 @@
         self.buffer['imagemap'] = []
         fp.visititems(func)
+        return head
         
     def readDataset(self,fp,imagenum=1):
@@ -109 +113 @@
         else:
             image = dset[0,num,...]
-        head = ['raw data']
         sizexy = list(image.shape) 
-        Npix = sizexy[0]*sizexy[1]             
-        data = {'pixelSize':[200,200],'wavelength':0.15,'distance':250.0,
-                'center':[204.8,204.8],'size':sizexy}
-        return head,data,Npix,image
+        Npix = sizexy[0]*sizexy[1]
+        data = {'pixelSize':[200.,200.],'wavelength':0.15,'distance':1000.,
+                'center':[sizexy[0]*0.1,sizexy[1]*0.1],'size':sizexy}
+        for item in self.Comments:
+            name,val = item.split(':',1)
+            if 'wavelength' in name and 'spread' not in name:
+                try:
+                    data['wavelength'] = float(val)
+                except ValueError:
+                    pass
+            elif 'distance' in name:
+                data['distance'] = float(val)
+            elif 'x_pixel_size' in name:
+                data['pixelSize'][0] = float(val)*1000.
+            elif 'y_pixel_size' in name:
+                data['pixelSize'][1] = float(val)*1000.
+            elif 'beam_center_x' in name: 
+                data['center'][0] = float(val)
+            elif 'beam_center_y' in name: 
+                data['center'][1] = float(val)                
+        return data,Npix,image.T