From d34e97822b68eb1fd1c9d222400f01f653e44ef3 Mon Sep 17 00:00:00 2001
From: Laurent Mercadier <mercadil@max-exfl090.desy.de>
Date: Sat, 27 Apr 2019 15:57:00 +0200
Subject: [PATCH] gave names to XGM arrays in matchXgmTimPulseId()
---
xgm.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/xgm.py b/xgm.py
index f45a4cf..d610569 100644
--- a/xgm.py
+++ b/xgm.py
@@ -744,15 +744,15 @@ 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):
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:
--
GitLab