From 7d7d4440db8a68548ee5946ef244c3b4f5152ace Mon Sep 17 00:00:00 2001 From: ahmedk <karim.ahmed@xfel.eu> Date: Thu, 5 Oct 2023 22:01:39 +0200 Subject: [PATCH] rel_gain _..to relgain_.. --- notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb | 8 ++++---- src/cal_tools/agipdlib.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb index 7fe538dc0..8e1de3143 100644 --- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb +++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb @@ -641,7 +641,7 @@ " get_constants_and_update_metadata(\n", " agipd_cal, agipd_metadata, ff_constants)\n", "\n", - "if any(agipd_corr.gain_bools):\n", + "if any(agipd_corr.relgain_bools):\n", " if not rel_gain in [\"cs\", \"pc\", \"off\"]:\n", " raise ValueError(\n", " \"Selected `rel_gain_mode` is unexpected. \"\n", @@ -660,10 +660,10 @@ "\n", "step_timer.done_step(\"Constants were retrieved in\")\n", "\n", - "rel_gain_alias = \"CS\" if rel_gain == \"cs\" else \"PC\"\n", + "relgain_alias = \"CS\" if rel_gain == \"cs\" else \"PC\"\n", "print(\"Preparing constants (\"\n", " f\"FF: {agipd_corr.corr_bools.get('xray_corr', False)}, \"\n", - " f\"{rel_gain_alias}: {any(agipd_corr.rel_gain_bools)}, \"\n", + " f\"{relgain_alias}: {any(agipd_corr.relgain_bools)}, \"\n", " f\"BLC: {any(agipd_corr.blc_bools)})\")\n", "# Display retrieved calibration constants timestamps\n", "agipd_cal.display_markdown_retrieved_constants(metadata=agipd_metadata)" @@ -767,7 +767,7 @@ "\n", " # Store few time stamps if exists\n", " # Add NA to keep array structure\n", - " for key in ['Offset', f'Slopes{rel_gain_alias}', 'SlopesFF']:\n", + " for key in ['Offset', f'Slopes{relgain_alias}', 'SlopesFF']:\n", " if key in mod_mdata:\n", " module_timestamps[key] = mod_mdata[key][\"begin_validity_at\"]\n", " else:\n", diff --git a/src/cal_tools/agipdlib.py b/src/cal_tools/agipdlib.py index 6763de1d6..0a00709dd 100644 --- a/src/cal_tools/agipdlib.py +++ b/src/cal_tools/agipdlib.py @@ -634,7 +634,7 @@ class AgipdCorrections: f'{bools} are not available!') # Flags allowing for pulse capacitor constant retrieval. - self.rel_gain_bools = [ + self.relgain_bools = [ self.corr_bools.get("rel_gain") != "off", # This correction is disable if rel_gain = `cs` self.corr_bools.get("adjust_mg_baseline"), @@ -1425,7 +1425,7 @@ class AgipdCorrections: self.xray_cor[module_idx][...] = xray_cor.transpose()[...] # add additional bad pixel information - if any(self.rel_gain_bools): + if any(self.relgain_bools): for rg in ["CS", "PC"]: if f"BadPixels{rg}" in cons_data: bp_relgain = np.moveaxis( -- GitLab