From 041ff6a6f937a2e7a9c590de9ab5d7bdb22797aa Mon Sep 17 00:00:00 2001
From: Vratko Rovensky <vratko.rovensky@xfel.eu>
Date: Thu, 25 Apr 2024 18:00:45 +0200
Subject: [PATCH] Swaping axis order of CS consts to match other AGIPD consts,
typo fix, inserted numbering of CS consts in documentation.
---
...Characterization_unequalClockStep_NBC.ipynb | 18 +++++++++---------
...acterization_unequalClockStep_Summary.ipynb | 17 +++++++++--------
2 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb
index b5233e12d..d8b042233 100644
--- a/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb
+++ b/notebooks/AGIPD/CS_Characterization_unequalClockStep_NBC.ipynb
@@ -22,18 +22,18 @@
"\n",
"The fitted slopes and intercepts are sanitised in the next steps; problematic fits and pixels are marked as bad and median values are used to replace these values.\n",
"\n",
- "Constants are saved wit the following notation: \n",
+ "Constants are saved with the following notation: \n",
"- Slopes:\n",
- " - mH: high gain slope\n",
- " - mM: medium gain slope\n",
- " - mL: low gain slope\n",
+ " - mH: high gain slope (0)\n",
+ " - mM: medium gain slope (1)\n",
+ " - mL: low gain slope (2)\n",
"- Intercepts:\n",
- " - bH: high gain intercept\n",
- " - bM: medium gain intercept\n",
- " - bL: low gain intercept\n",
+ " - bH: high gain intercept (3)\n",
+ " - bM: medium gain intercept (4)\n",
+ " - bL: low gain intercept (5)\n",
"- Ratios:\n",
- " - H-M: ratio of high gain and medium gain slope\n",
- " - M-L: ratio of medium gain and low gain slope"
+ " - H-M: ratio of high gain and medium gain slope (6)\n",
+ " - M-L: ratio of medium gain and low gain slope (7)"
]
},
{
diff --git a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
index f9baf7f6d..12cc966ba 100644
--- a/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
+++ b/notebooks/AGIPD/CS_Characterization_unequalClockStep_Summary.ipynb
@@ -165,16 +165,16 @@
"outputs": [],
"source": [
"# Sanitised constants keys:\n",
- "# mH: high gain slope\n",
- "# mM: medium gain slope\n",
- "# mL: low gain slope\n",
+ "# mH: high gain slope (0)\n",
+ "# mM: medium gain slope (1)\n",
+ "# mL: low gain slope (2)\n",
"#\n",
- "# bH: high gain intercept\n",
- "# bM: medium gain intercept\n",
- "# bL: low gain intercept\n",
+ "# bH: high gain intercept (3)\n",
+ "# bM: medium gain intercept (4)\n",
+ "# bL: low gain intercept (5)\n",
"# \n",
- "# H-M: ratio of high gain and medium gain slope\n",
- "# M-L: ratio of medium gain and low gain slope\n",
+ "# H-M: ratio of high gain and medium gain slope (6)\n",
+ "# M-L: ratio of medium gain and low gain slope (7)\n",
"\n",
"# Consts saved to DB as (8,mem_cells,128,512) \n",
"# order: ['mH', 'mM', 'mL', 'bH', 'bM', 'bL']\n",
@@ -247,6 +247,7 @@
" arr = np.zeros((8,mem_cells,128,512), np.float32)\n",
" for i, key in enumerate(d):\n",
" arr[i,...] = d[key]\n",
+ " arr = np.transpose(arr, (2, 3, 1, 0))\n",
" \n",
" return arr"
]
--
GitLab