Changeset 261

Timestamp:

Mar 11, 2011 2:06:54 PM (11 years ago)

Author:

vondreele

Message:

new fortran fellipse - for fitting ellipses!
GSASIIplot.py - change calibration start to RB not on a point, more foolproof than the shift method
GSASIIimgGUI.py - change status text to reflect above & add another place to dmin
GSASIIimage.py - implement fellipse & tighten up the fitting process

Location:

trunk

Files:

• GSASIIimage.py (modified) (8 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (2 diffs)
• fsource/fellipse.for (added)

trunk/GSASIIimage.py

@@ -15 +15 @@
 import GSASIIplot as G2plt
 import GSASIIlattice as G2lat
+import fellipse as fel
 
 # trig functions in degrees
@@ -56 +57 @@
                     
 def FitRing(ring):
-    Err,parms = FitCircle(ring)
-    Err /= len(ring)
-#    print 'circle error:','%8f'%(Err)
-    if Err > 20000.:
-        eparms = FitEllipse(ring)
-        if eparms:
-            parms = eparms
+    err,parms = FitEllipse(ring)
+    errc,parmsc = FitCircle(ring)
+    errc = errc[0]/(len(ring)*parmsc[2][0]**2)
+#    print 'Ellipse?',err,parms
+#    print 'Circle? ',errc,parmsc
+    if not parms or errc < .1:
+        parms = parmsc
     return parms
         
@@ -115 +116 @@
     M = np.array((x**2-y**2,x*y,x,y,np.ones_like(x)))
     B = np.array(-(x**2+y**2))
-    result = nl.lstsq(M.T,B)
-    return makeParmsEllipse(result[0])
+    bb,err = fel.fellipse(len(x),x,y,1.E-7)
+    return err,makeParmsEllipse(bb)
     
 def FitDetector(rings,p0,wave):
@@ -172 +173 @@
     sphi = sind(phi)
     ring = []
-    for a in range(-180,180,2):
+    for a in range(-180,180,1):
         x = radii[0]*cosd(a)
         y = radii[1]*sind(a)
@@ -184 +185 @@
             Y /= scaley
             ring.append([X,Y,dsp])
-    if len(ring) < 10:             #want more than 20deg
+    if len(ring) < 20:             #want more than 20 deg
         return []
     return ring
@@ -334 +335 @@
         return False
         
-    #setup 180 points on that ring for "good" fit
+    #setup 360 points on that ring for "good" fit
     Ring = makeRing(1.0,ellipse,pixLimit,cutoff,scalex,scaley,self.ImageZ)
     if Ring:
@@ -405 +406 @@
             dist = calcDist(radii,tth)
             distR = 1.-dist/data['distance']
-            if abs(distR) > 0.1:
-                print distR,dist,data['distance']
-                del data['rings'][-1]
+            if abs(distR) > 0.01:
+#                print distR,dist,data['distance']
+#                del data['rings'][-1]
                 continue
             if distR > 0.001:
@@ -415 +416 @@
             else:
                 ellipse = newellipse
-                if abs((radii[1]/radii[0]-ratio)/ratio) > 0.01:
+                if abs((radii[1]/radii[0]-ratio)/ratio) > 0.1:
                     print 'Bad fit for ring # %i. Try reducing Pixel search range'%(i)
                     return False

trunk/GSASIIimgGUI.py

@@ -69 +69 @@
         except ValueError:
             pass
-        calibDmin.SetValue("%.1f"%(data['calibdmin']))          #reset in case of error  
+        calibDmin.SetValue("%.2f"%(data['calibdmin']))          #reset in case of error  
                 
     def OnAzmthOff(event):
@@ -189 +189 @@
         data['setRings'] = False
         setRings.SetValue(data['setRings'])
-        self.dataFrame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick, RB to delete; shift LB to finish')
+        self.dataFrame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick, RB on point to delete else RB to finish')
         self.ifGetRing = True
         
@@ -533 +533 @@
     comboSizer.Add(wx.StaticText(parent=self.dataDisplay,label=' Min calib d-spacing '),0,
         wx.ALIGN_CENTER_VERTICAL)
-    calibDmin = wx.TextCtrl(parent=self.dataDisplay,value=("%.1f" % (data['calibdmin'])),
+    calibDmin = wx.TextCtrl(parent=self.dataDisplay,value=("%.2f" % (data['calibdmin'])),
         style=wx.TE_PROCESS_ENTER)
     calibDmin.Bind(wx.EVT_TEXT_ENTER,OnCalibDmin)

trunk/GSASIIplot.py

@@ -1039 +1039 @@
             if Ypos and not Page.toolbar._active:         #make sure zoom/pan not selected
                 if event.button == 1:
-                    if event.key == 'shift':                #terminate picking?
-                        print 'LB shift'
-                        self.dataFrame.GetStatusBar().SetStatusText('Calibrating...')
-                        if G2img.ImageCalibrate(self,Data):
-                            self.dataFrame.GetStatusBar().SetStatusText('Calibration successful')
-                            print 'Calibration successful'
-                        else:
-                            self.dataFrame.GetStatusBar().SetStatusText('Calibration failed')
-                            print 'Calibration failed'
-                        self.ifGetRing = False
-                        G2imG.UpdateImageControls(self,Data,Masks)
-                        return
                     Xpix = Xpos*scalex
                     Ypix = Ypos*scaley
@@ -1060 +1048 @@
                         ypos /= scaley
                         Data['ring'].append([xpos,ypos])
+                elif event.button == 3:
+                    print 'LB shift'
+                    self.dataFrame.GetStatusBar().SetStatusText('Calibrating...')
+                    if G2img.ImageCalibrate(self,Data):
+                        self.dataFrame.GetStatusBar().SetStatusText('Calibration successful - Show ring picks to check')
+                        print 'Calibration successful'
+                    else:
+                        self.dataFrame.GetStatusBar().SetStatusText('Calibration failed - Show ring picks to diagnose')
+                        print 'Calibration failed'
+                    self.ifGetRing = False
+                    G2imG.UpdateImageControls(self,Data,Masks)
+                    return
                 PlotImage(self,newImage=False)
             return