From 1ea5ad7751dd4a9080c2066d29e16cc7b66635d0 Mon Sep 17 00:00:00 2001
From: Mercadier <mercadil@win.desy.de>
Date: Mon, 29 Apr 2019 09:12:33 +0200
Subject: [PATCH] drops initial MCPapd and MCPraw in matchXgmTimPulseId()
---
xgm.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/xgm.py b/xgm.py
index 11294d6..d4daf34 100644
--- a/xgm.py
+++ b/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
--
GitLab