Uncommitted changes

startup/21-xspress3.py

@@ -160,7 +160,7 @@ def unstage(self, *args, **kwargs):
 energy_M_list = np.array([1646,1712,1775,1840,1907,1976,2048,2118,2191,2267,2342,2418,2499,2577,2654,2732,2806,2900,884,927,979,1023,1078,1122,1181,1233,1284,1342,1404,1463,1526,1580,2990,3071,3164,3250,3339,3429,3525,3616,3709])
 
 
-elem_list_xspress3_roi = np.array(['Pt_M','Si','S','K','Mo_L','Ca','Fe','Zn','Cl','P','Ni','Cr','Co','Au_M','Cu','Mn'])
+elem_list_xspress3_roi = np.array(['Pt_M','Ba_L','Cr','Cu','K','Fe','Ca','Ti','Si','Cl','P','Ni','Co','P','Cu','Mn'])
 
 
 def xspress3_roi_setup():

startup/51-flyscan.py

@@ -52,15 +52,15 @@
 
 #live_im_plot = FlyLiveImage(['Ca','W_L','Fe','Pt_L'], channels=[1, 2, 3])
 
-live_im_plot = FlyLiveImage(['Cr','K','Fe','S'], channels=[1, 2, 3])
+live_im_plot = FlyLiveImage(['Cu', 'Ba_L','Ti'], channels=[1, 2, 3])
 
 # fly2dplot1 = FlyLiveCrossSection(['V'], channels=[1, 2, 3)
 
 #pt_plot = FlyRoiPlot(['Cr'],
 #                     channels=[1, 2, 3],
 #                     )
 
-pt_plot = FlyRoiPlot(['Fe'],
+pt_plot = FlyRoiPlot(['Cu'],
                      channels=[1, 2, 3],
                     )
 

startup/60-viewer2d.py

@@ -24,6 +24,7 @@ def figure_with_insert_fig_button(*args, **kwargs):
 def plot2d(scan_id, elem, norm='sclr1_ch4'):
 
     scan_info = db[scan_id]
+    scan_id, df = _load_scan(scan_id, fill_events=False)
     tmp = scan_info['start']
     y_motor = tmp['motors'][0]
     x_motor = tmp['motors'][1]