From 96abfe3227f4d41f59fefbf81c0289c1c6776030 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Mon, 16 Oct 2023 11:44:55 +0200
Subject: [PATCH] explicitly display if a parameter was manually set
---
...Jungfrau_Gain_Correct_and_Verify_NBC.ipynb | 22 ++++++++++++++-----
...rk_analysis_all_gains_burst_mode_NBC.ipynb | 15 ++++++++++---
2 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
index eae5935ca..3c65015a9 100644
--- a/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_Gain_Correct_and_Verify_NBC.ipynb
@@ -153,6 +153,7 @@
" memory_cells, sc_start = ctrl_data.get_memory_cells()\n",
"\n",
" mem_cells_name = \"single cell\" if memory_cells == 1 else \"burst\"\n",
+ " print(f\"Number of memory cells are {memory_cells}\")\n",
" print(f\"Run is in {mem_cells_name} mode.\\nStorage cell start: {sc_start:02d}\")\n",
"else:\n",
" memory_cells = mem_cells\n",
@@ -161,18 +162,27 @@
"\n",
"if integration_time < 0:\n",
" integration_time = ctrl_data.get_integration_time()\n",
+ " print(f\"Integration time is {integration_time} us\")\n",
+ "else:\n",
+ " print(f\"Integration time is manually set to {integration_time} us\")\n",
+ "\n",
"if bias_voltage < 0:\n",
" bias_voltage = ctrl_data.get_bias_voltage()\n",
+ " print(f\"Bias voltage is {bias_voltage} V\")\n",
+ "else:\n",
+ " print(f\"Bias voltage is manually set to {bias_voltage} V.\")\n",
+ "\n",
"if gain_setting < 0:\n",
" gain_setting = ctrl_data.get_gain_setting()\n",
+ " print(f\"Gain setting is {gain_setting} (run settings: {ctrl_data.run_settings})\")\n",
+ "else:\n",
+ " print(f\"Gain setting is manually set to {gain_setting}.\")\n",
+ "\n",
"if gain_mode < 0:\n",
" gain_mode = ctrl_data.get_gain_mode()\n",
- "\n",
- "print(f\"Integration time is {integration_time} us\")\n",
- "print(f\"Gain setting is {gain_setting} (run settings: {ctrl_data.run_settings})\")\n",
- "print(f\"Gain mode is {gain_mode} ({ctrl_data.run_mode})\")\n",
- "print(f\"Bias voltage is {bias_voltage} V\")\n",
- "print(f\"Number of memory cells are {memory_cells}\")"
+ " print(f\"Gain mode is {gain_mode} ({ctrl_data.run_mode})\")\n",
+ "else:\n",
+ " print(f\"Gain mode is manually set to {gain_mode}.\")"
]
},
{
diff --git a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
index b95ad890d..b3bc3aead 100644
--- a/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
+++ b/notebooks/Jungfrau/Jungfrau_dark_analysis_all_gains_burst_mode_NBC.ipynb
@@ -184,13 +184,22 @@
"\n",
" if integration_time < 0:\n",
" integration_time = ctrl_data.get_integration_time()\n",
- " print(f\"Integration time is {integration_time} us\")\n",
+ " print(f\"Integration time is {integration_time} us.\")\n",
+ " else:\n",
+ " print(f\"Integration time is manually set to {integration_time} us.\")\n",
+ "\n",
" if bias_voltage < 0:\n",
" bias_voltage = ctrl_data.get_bias_voltage()\n",
- " print(f\"Bias voltage is {bias_voltage} V\")\n",
+ " print(f\"Bias voltage is {bias_voltage} V.\")\n",
+ " else:\n",
+ " print(f\"Bias voltage is manually set to {bias_voltage} V.\")\n",
+ "\n",
" if gain_setting < 0:\n",
" gain_setting = ctrl_data.get_gain_setting()\n",
- " print(f\"Gain setting is {gain_setting} ({ctrl_data.run_settings})\")\n",
+ " print(f\"Gain setting is {gain_setting} ({ctrl_data.run_settings})\")\n",
+ " else:\n",
+ " print(f\"Gain setting is manually set to {gain_setting}.\")\n",
+ "\n",
" if run_mcells == 1:\n",
" memory_cells = 1\n",
" print('Dark runs in single cell mode, '\n",
--
GitLab