Changeset 4100

Timestamp:

Aug 19, 2019 12:29:20 PM (2 years ago)

Author:

toby

Message:

seq. ref bugs: correct use flag in avg calc; if selected X var is no longer in table

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (1 diff)

trunk/GSASIIdataGUI.py

@@ -6269 +6269 @@
         'average the selected columns from menu command'
         cols = sorted(G2frame.dataDisplay.GetSelectedCols()) # ignore selection order
-        useCol =  ~np.array(G2frame.SeqTable.GetColValues(0),dtype=bool)
+        useCol =  ~np.array(G2frame.SeqTable.GetColValues(1),dtype=bool)
         if cols:
             for col in cols:

trunk/GSASIIplot.py

@@ -6461 +6461 @@
         colors=['b','g','r','c','m','k']
         uselist = G2frame.SeqTable.GetColValues(1)
-        if G2frame.seqXaxis is not None:    
-            xName,X,Xsig = Page.seqTableGet(G2frame.seqXaxis)
-            if G2frame.seqReverse and not G2frame.seqXaxis:
-                X = X[::-1]
-        else:
-            X = np.arange(0,G2frame.SeqTable.GetNumberRows(),1)
-            xName = 'Data sequence number'
+        X = np.arange(0,G2frame.SeqTable.GetNumberRows(),1)
+        xName = 'Data sequence number'
+        if G2frame.seqXaxis is not None:
+            try: # fails if selected X column is no longer in table
+                xName,X,Xsig = Page.seqTableGet(G2frame.seqXaxis)
+                if G2frame.seqReverse and not G2frame.seqXaxis:
+                    X = X[::-1]
+            except:
+                print('X column no longer in table, resetting')
+                G2frame.seqXaxis = None
         for ic,col in enumerate(Page.seqYaxisList):
             Ncol = colors[ic%6]