From 32888c39b4deab36e61dc3db9e379e596dcda60d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Guyader?= <loic.le.guyader@xfel.eu>
Date: Tue, 29 Oct 2019 13:23:48 +0100
Subject: [PATCH] Fix plotting XAS from DSSC1module data
---
DSSC1module.py | 8 +++++---
XAS.py | 9 ++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/DSSC1module.py b/DSSC1module.py
index 81f6c91..f1fbf71 100644
--- a/DSSC1module.py
+++ b/DSSC1module.py
@@ -222,7 +222,8 @@ class DSSC1module:
self.module_data['t0'] = self.t0
- self.plot_title = f"{self.proposal} run: {self.module_data['run'].values} dark: {self.dark_data['run'].values}"
+ self.plot_title = f"{self.proposal} run: {self.module_data['run'].values} dark: {self.dark_data['run'].values}"
+ self.module_data.attrs['plot_title'] = self.plot_title
def compute_mask(self, low=0.01, high=0.8):
""" Compute a DSSC module mask from the noise map of a dark run.
@@ -294,9 +295,10 @@ class DSSC1module:
if save_folder is None:
save_folder = self.save_folder
-
- fname = f'run{self.run_nr}_dark.h5' # no scan
+
+ self.run_nr = dark_runNB
self.dark_data = xr.open_dataset(os.path.join(save_folder, f'run{dark_runNB}_dark.h5'), group='data')
+ self.plot_title = f"{self.proposal} dark: {self.dark_data['run'].values}"
def show_rois(self):
fig, ax1 = plt.subplots(nrows=1, figsize=[5, 2.5])
diff --git a/XAS.py b/XAS.py
index 527b079..8d1b298 100644
--- a/XAS.py
+++ b/XAS.py
@@ -181,9 +181,12 @@ def xas(nrun, bins=None, Iokey='SCS_SA3', Itkey='MCP3apd', nrjkey='nrj', Iooffse
ax1_twin.bar(bins_c, nosample['muIo'], width=0.80*(bins_c[1]-bins_c[0]),
color='C1', alpha=0.2)
ax1_twin.set_ylabel('Io')
- proposalNB=int(nrun.attrs['runFolder'].split('/')[-4][1:])
- runNB=int(nrun.attrs['runFolder'].split('/')[-2][1:])
- ax1.set_title('run {:d} p{:}'.format(runNB, proposalNB))
+ try:
+ proposalNB=int(nrun.attrs['runFolder'].split('/')[-4][1:])
+ runNB=int(nrun.attrs['runFolder'].split('/')[-2][1:])
+ ax1.set_title('run {:d} p{:}'.format(runNB, proposalNB))
+ except:
+ f.suptitle(nrun.attrs['plot_title'])
ax2 = plt.subplot(gs[1])
ax2.bar(bins_c, nosample['counts'], width=0.80*(bins_c[1]-bins_c[0]),
--
GitLab