merge 'xgm_tim' into 'master'

xgm.py

@@ -744,8 +744,8 @@ def matchXgmTimPulseId(data, use_apd=True, intstart=None, intstop=None,
             xr DataSet containing XGM and TIM signals with the share 
             dimension 'pId'. Raw traces, raw XGM and raw APD are dropped.
     '''
-    res = selectSASEinXGM(data, xgm='SCS_XGM').rename({'XGMbunchId':'pId'})
-    res2 = selectSASEinXGM(data, xgm='SA3_XGM').rename({'XGMbunchId':'pId'})
+    res = selectSASEinXGM(data, xgm='SCS_XGM').rename({'XGMbunchId':'pId'}).rename('SCS_XGM')
+    res2 = selectSASEinXGM(data, xgm='SA3_XGM').rename({'XGMbunchId':'pId'}).rename('SA3_XGM')
     dropList = ['SCS_XGM','SA3_XGM']
     mergeList = [res, res2]
     for mcp in range(1,5):