Merge remote-tracking branch 'remotes/origin/main'

Author: vondreele

GSASII/GSASIIpwdplot.py

@@ -2429,13 +2429,13 @@ def onPartialConfig(event):
                             for i,item in enumerate(tbl):
                                 if type(item) is dict: continue
                                 if i in selectedPeaks:
-                                    Ni = N+1
+                                    #Ni = N+1
                                     plotVline(Page,Plot,Lines,Parms,item[0],'yellow',False,'-')
                                     Lines[-1].set_lw(Lines[-1].get_lw()+1)
                                     plotVline(Page,Plot,Lines,Parms,item[0],color,True)
                                     Lines[-1].set_lw(Lines[-1].get_lw()+1)
                                 else:
-                                    Ni = N
+                                    #Ni = N
                                     plotVline(Page,Plot,Lines,Parms,item[0],color,True)
                         except:
                             pass
@@ -3609,7 +3609,7 @@ def CopyRietveld2csv(Pattern,Plot,Page,filename):
         DZ = (Pattern[1][1]-Pattern[1][3])*np.sqrt(wtFactor*Pattern[1][2])
         valueList.append(DZ)
 
-        if sum(Pattern[1][0].mask): # are there are excluded points? If so, add them too
+        if hasattr(Pattern[1][0],'mask') and sum(Pattern[1][0].mask): # are there are excluded points? If so, add them too
             lblList.append('excluded')
             valueList.append(1*Pattern[1][0].mask)
         lblList.append('Axis-limits')