From 90596e034fcdae68163935d24b52e99e52915a02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Guyader?= <loic.le.guyader@xfel.eu>
Date: Tue, 15 Mar 2022 14:31:53 +0100
Subject: [PATCH] BAM update for DSSC binning
---
doc/Dask DSSC module binning.ipynb | 4 ++--
doc/changelog.rst | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/doc/Dask DSSC module binning.ipynb b/doc/Dask DSSC module binning.ipynb
index c7f20a0..daa027d 100644
--- a/doc/Dask DSSC module binning.ipynb
+++ b/doc/Dask DSSC module binning.ipynb
@@ -158,7 +158,7 @@
" \n",
" # Load slow data against which to bin\n",
" if xaxis == 'delay':\n",
- " run, v = tb.load(proposalNB, runNB, ['PP800_DelayLine', 'BAM1932M', 'SCS_XGM'])\n",
+ " run, v = tb.load(proposalNB, runNB, ['PP800_DelayLine', 'BAM1932S', 'SCS_XGM'])\n",
" else:\n",
" run, v = tb.load(proposalNB, runNB, [xaxis, 'SCS_XGM'])\n",
" \n",
@@ -176,7 +176,7 @@
" # calculate bins\n",
" if xaxis == 'delay':\n",
" r['delay'] = tb.misc.positionToDelay(r['PP800_DelayLine'])\n",
- " bam = r['BAM1932M'] - r['BAM1932M'].mean()\n",
+ " bam = r['BAM1932S']\n",
" r['bin_delay'] = ((r['delay'] - bam)/bin_width).round()*bin_width\n",
" else:\n",
" r['bin_' + xaxis] = (r[xaxis]/bin_width).round()*bin_width\n",
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 413b0e6..81a0c69 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -6,7 +6,8 @@ unreleased
- **Bug fixes**
- - fix :issue:`38` BAM timing correction changed from jitter to drift BOZ analysis :mr:`181`
+ - fix :issue:`38` BAM timing correction changed from jitter to drift in BOZ
+ and DSSC binning analysis :mr:`181`
- fix :issue:`45` SLURM scripts embedded in and download link available from documentation :mr:`171`
- fix :issue:`8` regarding azimuthal integration with pyFAI and hexagonal DSSC pixel splitting by providing an example notebook :mr:`174`
- fix :issue:`46` with a change in dask groupby mean behavior :mr:`174`
--
GitLab