Merge branch 'tim_xgm_match' into 'master'

drops initial MCPapd and MCPraw in matchXgmTimPulseId()

See merge request SCS/ToolBox!21

xgm.py

@@ -700,7 +700,6 @@ def checkTimApdWindow(data, mcp=1, use_apd=True, intstart=None, intstop=None):
         step = sa3.where(data['npulses_sase3']>1, drop=True)[0,:2].values
         step = int(step[1] - step[0])
         nsamples = 440 * step
-        print(nsamples)
     else:
         nsamples = 0
 
@@ -754,16 +753,19 @@ def matchXgmTimPulseId(data, use_apd=True, intstart=None, intstop=None,
     mergeList = [res, 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, intstop=intstop,
-                              bkgstart=bkgstart, bkgstop=bkgstop, t_offset=t_offset, 
-                              npulses=npulses).rename('MCP{}apd'.format(mcp))
+            MCPapd = getTIMapd(data, mcp=mcp, use_apd=use_apd, intstart=intstart,
+                               intstop=intstop,bkgstart=bkgstart, bkgstop=bkgstop,
+                               t_offset=t_offset, 
+                               npulses=npulses).rename('MCP{}apd'.format(mcp))
             if use_apd:
                 MCPapd = MCPapd.rename({'apdId':'pId'})
             else:
                 MCPapd = MCPapd.rename({'MCP{}fromRaw'.format(mcp):'pId'})
-                dropList.append('MCP{}raw'.format(mcp))
             mergeList.append(MCPapd)
-            dropList.append('MCP{}apd'.format(mcp))
+            if 'MCP{}raw'.format(mcp) in data:
+                dropList.append('MCP{}raw'.format(mcp))
+            if 'MCP{}apd'.format(mcp) in data:
+                dropList.append('MCP{}apd'.format(mcp))
     mergeList.append(data.drop(dropList))
     subset = xr.merge(mergeList, join='inner')
     return subset