Merge branch 'xas_plot_title' into 'master'

Fixes bug in XAS plot title

See merge request !60

XAS.py

@@ -12,6 +12,7 @@
 import numpy as np
 import matplotlib.gridspec as gridspec
 import matplotlib.pyplot as plt
+import re
 
 def absorption(T, Io):
     """ Compute the absorption A = -ln(T/Io)
@@ -190,9 +191,9 @@ def xas(nrun, bins=None, Iokey='SCS_SA3', Itkey='MCP3apd', nrjkey='nrj', Iooffse
                 color='C1', alpha=0.2)
         ax1_twin.set_ylabel('Io')
         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))
+            proposalNB=int(re.findall(r'p(\d{6})', nrun.attrs['runFolder'])[0])
+            runNB=int(re.findall(r'r(\d{4})', nrun.attrs['runFolder'])[0])
+            ax1.set_title(f'run {runNB} p{proposalNB}')
         except:
             f.suptitle(nrun.attrs['plot_title'])