Changeset 1660

Timestamp:

Feb 17, 2015 3:27:12 PM (8 years ago)

Author:

vondreele

Message:

fix crash in viewing PWDR data Limits
add new item to PWDR data ('Super':True/False?)
fix plotting problem with reflection tic mark positions
add recovery after bas LS fails making new copy of gpx file

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)
• GSASIIstrIO.py (modified) (5 diffs)

trunk/GSASIIgrid.py

@@ -4168 +4168 @@
     elif G2frame.PatternTree.GetItemText(item) == 'Limits':
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)
-        datatype = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)[2][:4]
+        datatype = G2frame.PatternTree.GetItemText(G2frame.PatternId)[:4]
         G2frame.PickId = item
         data = G2frame.PatternTree.GetItemPyData(item)

trunk/GSASIIplot.py

@@ -1685 +1685 @@
                 if not len(peaks):
                     continue
-                if len(peaks[0]) > 15:  #is there a way to plot ss lines differnt color than main ones?
+                if Phases[phase].get('Super',False):
                     peak = np.array([[peak[5],peak[6]] for peak in peaks])
                 else:

trunk/GSASIIstrIO.py

@@ -461 +461 @@
     '''
                         
+    import distutils.file_util as dfu
     GPXback = GPXBackup(GPXfile,makeBack)
     print 'Read from file:',GPXback
@@ -493 +494 @@
         except KeyError:
             pass
-                                
-        cPickle.dump(data,outfile,1)
-    infile.close()
-    outfile.close()
+        try:                        
+            cPickle.dump(data,outfile,1)
+        except AttributeError:
+            print 'ERROR - bad data in least squares result'
+            infile.close()
+            outfile.close()
+            dfu.copy_file(GPXback,GPXfile)
+            print 'GPX file save failed - old version retained'
+            return
+            
     print 'GPX file save successful'
     
@@ -2101 +2108 @@
                     Phi = []
                     if Phases[phase]['General']['Type'] in ['modulated','magnetic']:
+                        ifSuper = True
                         HKLd = np.array(G2lat.GenSSHLaue(dmin,SGData,SSGData,Vec,maxH,A))
                         HKLd = G2mth.sortArray(HKLd,4,reverse=True)
@@ -2123 +2131 @@
                                         Phi.append(phi)
                     else:
+                        ifSuper = False
                         HKLd = np.array(G2lat.GenHLaue(dmin,SGData,A))
                         HKLd = G2mth.sortArray(HKLd,3,reverse=True)
@@ -2145 +2154 @@
                                     Uniq.append(uniq)
                                     Phi.append(phi)
-                    Histogram['Reflection Lists'][phase] = {'RefList':np.array(refList),'FF':{},'Type':inst['Type'][0]}
+                    Histogram['Reflection Lists'][phase] = {'RefList':np.array(refList),'FF':{},'Type':inst['Type'][0],'Super':ifSuper}
             elif 'HKLF' in histogram:
                 inst = Histogram['Instrument Parameters'][0]