Merge branch 'noSA3fix' into 'master'

Fix crash of matchXgmTimPulseId when SA3_XGM was not loaded

See merge request SCS/ToolBox!23

xgm.py

@@ -771,9 +771,14 @@ def matchXgmTimPulseId(data, use_apd=True, intstart=None, intstop=None,
             dimension 'pId'. Raw traces, raw XGM and raw APD are dropped.
     '''
     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]
+    dropList = ['SCS_XGM']
+    mergeList = [res]
+
+    if 'SA3_XGM' in data: 
+        res2 = selectSASEinXGM(data, xgm='SA3_XGM').rename({'XGMbunchId':'pId'}).rename('SA3_XGM')
+        dropList.append('SA3_XGM')
+        mergeList.append(res2)
+
     for mcp in range(1,5):
         if 'MCP{}apd'.format(mcp) in data or 'MCP{}raw'.format(mcp) in data:
             MCPapd = getTIMapd(data, mcp=mcp, use_apd=use_apd, intstart=intstart,