Changeset 2630

Timestamp:

Jan 14, 2017 9:00:40 AM (6 years ago)

Author:

vondreele

Message:

change '(Running)' to Pause' in auto integrate dialog
remove remaining clutter from now removed Progress Bar in integrste
catch an old pdf version problem

Location:

trunk

Files:

• GSASIIimage.py (modified) (8 diffs)
• GSASIIimgGUI.py (modified) (3 diffs)
• GSASIIpwd.py (modified) (1 diff)

trunk/GSASIIimage.py

@@ -23 +23 @@
 import polymask as pm
 from scipy.optimize import leastsq
-import scipy.signal as scsg
 import copy
 import GSASIIpath
@@ -31 +30 @@
 import GSASIIpwd as G2pwd
 import GSASIIspc as G2spc
-import GSASIImath as G2mth
 
 # trig functions in degrees
@@ -887 +885 @@
     nXBlks = (Nx-1)/blkSize+1
     nYBlks = (Ny-1)/blkSize+1
-    Nup = nXBlks*nYBlks*3+3
     tbeg = time.time()
-    Nup = 0
     times = [0,0,0,0,0]
     for iBlk in range(nYBlks):
@@ -899 +895 @@
             # next is most expensive step!
             TA,tam = Make2ThetaAzimuthMap(data,masks,(iBeg,iFin),(jBeg,jFin),times)           #2-theta & azimuth arrays & create position mask
-            Nup += 1
             Block = image[iBeg:iFin,jBeg:jFin]
             t0 = time.time()
@@ -905 +900 @@
             del TA; del tam
             times[2] += time.time()-t0
-            Nup += 1
             tax = np.where(tax > LRazm[1],tax-360.,tax)                 #put azm inside limits if possible
             tax = np.where(tax < LRazm[0],tax+360.,tax)
@@ -924 +918 @@
                     numAzms,numChans,LRazm,lutth,Dazm,dtth,NST,H0)
             times[3] += time.time()-t0
-            Nup += 1
             del tax; del tay; del taz; del tad; del tabs
     t0 = time.time()
@@ -947 +940 @@
         #NB: in G2pwd.Polarization azm is defined from plane of polarization, not image x axis!
         H0 /= np.array([G2pwd.Polarization(data['PolaVal'][0],H2[:-1],Azm=azm-90.)[0] for azm in (H1[:-1]+np.diff(H1)/2.)])
-    Nup += 1
     times[4] += time.time()-t0
     print 'Step times: \n apply masks  %8.3fs xy->th,azm   %8.3fs fill map     %8.3fs \
@@ -1148 +1140 @@
     #should be able to filter out spotty Bragg rings here
     PeaksList = np.array(PeaksList)
-#    Peakarray = np.vstack((tth,peaks.T)).T
-#    Peakarray = np.array(G2mth.sortArray(Peakarray,0))  #now in 2theta 
-#    if peaks.shape[0] > 100:
-#        txt = 'More than 100 spots found: %d. Are rings spotty?'%(len(jndx))
-#        return txt
     Points = np.ones((PeaksList.shape[0],3))
-#    Points[:,:2] = Peakarray[:,1:]
     Points[:,:2] = PeaksList
     Masks['Points'] = list(Points)

trunk/GSASIIimgGUI.py

@@ -2393 +2393 @@
         mnsizer.Add(lblsizr,0,wx.ALIGN_CENTER,1)
 
+        #put automatic PDF controls here?
         # buttons on bottom
         mnsizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'AutoIntegration controls'),0,wx.TOP,5)
@@ -2409 +2410 @@
         sizer.Add((20,-1))
         mnsizer.Add(sizer,0,wx.EXPAND|wx.BOTTOM|wx.TOP,5)
-        
+        '''or put automatic PDF controls here?
+        Auto PDF check box - if True:
+            chemical formula needed - or maybe fake it?
+        
+        '''
         # finish up window
         mnpnl.SetSizer(mnsizer)
@@ -2522 +2527 @@
         if sys.platform != "win32":
             for item in (self.btnstart,self.btnreset,self.btnclose): item.Enable(flag)
-        if flag:
-            self.btnstart.SetLabel('Pause')
-        else:
-            self.btnstart.SetLabel('(running)')
+        self.btnstart.SetLabel('Pause')
         wx.Yield()
                 

trunk/GSASIIpwd.py

@@ -341 +341 @@
     maxQ = np.searchsorted(Qpoints,qLimits[1])
     newdata = []
-    xydata['IofQ'] = [IofQ[0],[Qpoints,Qdata],IofQ[2]]
+    if len(IofQ) < 3:
+        xydata['IofQ'] = [IofQ[0],[Qpoints,Qdata],'']
+    else:
+        xydata['IofQ'] = [IofQ[0],[Qpoints,Qdata],IofQ[2]]
     for item in xydata['IofQ'][1]:
         newdata.append(item[:maxQ])