Address #192 where plot values are np.array not MaskedArray, but don't understand why it is happening

Author: briantoby

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')

tests/test_image.py

@@ -56,14 +56,14 @@ def test_image():
     x = plist[0].getdata('x')
     tt1,i1 = (x[233]+x[280])/2,sum(i[233:281])
     #print(tt1,i1)
-    msg = 'Test 1st peak'
-    assert abs(tt1 - 2.2695) < 0.0002, msg+f' pos ({tt1})'
-    assert abs(i1 - 4656.698709171848) < 0.1, msg+f' intensity ({i1})'
+    msg = 'Confirm 1st peak'
+    assert abs(tt1 - 2.2695) < 0.0002, msg+' pos'
+    assert abs(i1 - 4645.6850578694975) < 0.1, msg+' intensity'
     tt6,i6 = (x[780]+x[850])/2,sum(i[780:851])
     #print(tt6,i6)
-    msg = 'Test 6th peak'
-    assert abs(tt6 - 3.9450) < 0.0002, msg+f' pos ({tt6})'
-    assert abs(i6 - 26423.739680809293) < 0.1, msg+f' intensity ({i6})'
+    msg = 'Confirm 6th peak'
+    assert abs(tt6 - 3.9450) < 0.0002, msg+' pos'
+    assert abs(i6 - 26236.795563010724) < 0.1, msg+' intensity'
     print('OK')
 
 def test_CBF():