diff --git a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
index 8a67c9ce830f6a8d7eb781a2af10b6b08a8d63d8..70e0450aea363aba8ab16e96bff6ff626a80bd15 100644
--- a/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Characterize_Darks_Gotthard2_NBC.ipynb
@@ -194,7 +194,10 @@
"single_photon = conditions[\"single_photon\"].pop()\n",
"print(\"Single photon: \", single_photon)\n",
"acquisition_rate = conditions[\"acquisition_rate\"].pop()\n",
- "print(\"Acquisition rate: \", acquisition_rate)"
+ "print(\"Acquisition rate: \", acquisition_rate)\n",
+ "\n",
+ "gh2_detector = g2ctrl.get_det_type()\n",
+ "print(f\"Processing {gh2_detector} Gotthard2.\")\n"
]
},
{
@@ -204,11 +207,6 @@
"metadata": {},
"outputs": [],
"source": [
- "# Decide if GH2 is 25um or 50um\n",
- "gh2_hostname = run_dc.get_run_value(ctrl_src, \"rxHostname\")\n",
- "# gh2_hostname is a vector of bytes objects.\n",
- "# GH2 25um has two host-names unlike 50um which has one.\n",
- "\n",
"calcat = CalCatApi(client=calibration_client())\n",
"detector_id = calcat.detector(karabo_id)['id']\n",
"pdus_by_da = calcat.physical_detector_units(detector_id, pdu_snapshot_at=creation_time)\n",
@@ -222,9 +220,6 @@
"else:\n",
" karabo_da = sorted(da_to_pdu.keys())\n",
"\n",
- "if gh2_hostname[1].decode(\"utf-8\"):\n",
- " print(\"Data is for 25um Gotthard2.\")\n",
- "\n",
"print(f\"Processing {karabo_da}\")"
]
},
diff --git a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
index 117a703991bf6164321b5b9697eea9ea58cb4f91..2486a3d7f3d2565ab510c09b8780b74d8aba4892 100644
--- a/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
+++ b/notebooks/Gotthard2/Correction_Gotthard2_NBC.ipynb
@@ -53,7 +53,7 @@
"\n",
"# Parameters used to access raw data.\n",
"karabo_id = \"DETLAB_25UM_GH2\" # karabo prefix of Gotthard-II devices\n",
- "karabo_da = [\"DA01/1\", \"DA01/2\"] # data aggregators\n",
+ "karabo_da = [\"\"] # data aggregators\n",
"receiver_template = \"RECEIVER\" # receiver template used to read INSTRUMENT keys.\n",
"control_template = \"CONTROL\" # control template used to read CONTROL keys.\n",
"ctrl_source_template = \"{}/DET/{}\" # template for control source name (filled with karabo_id_control)\n",
@@ -62,7 +62,7 @@
"# Parameters for calibration database.\n",
"cal_db_interface = \"tcp://max-exfl-cal001:8016#8025\" # the database interface to use.\n",
"cal_db_timeout = 180000 # timeout on caldb requests.\n",
- "creation_time = \"2023-03-22 10:04:26\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC e.g. \"2022-06-28 13:00:00\"\n",
+ "creation_time = \"\" # To overwrite the measured creation_time. Required Format: YYYY-MM-DD HR:MN:SC e.g. \"2022-06-28 13:00:00\"\n",
"\n",
"# Parameters affecting corrected data.\n",
"constants_file = \"\" # Use constants in given constant file path. /gpfs/exfel/data/scratch/ahmedk/dont_remove/gotthard2/constants/calibration_constants_GH2.h5\n",
@@ -179,11 +179,14 @@
"if single_photon == -1:\n",
" single_photon = g2ctrl.get_single_photon()\n",
"\n",
+ "gh2_detector = g2ctrl.get_det_type()\n",
+ "\n",
"print(\"Bias Voltage:\", bias_voltage)\n",
"print(\"Exposure Time:\", exposure_time)\n",
"print(\"Exposure Period:\", exposure_period)\n",
"print(\"Acquisition Rate:\", acquisition_rate)\n",
- "print(\"Single Photon:\", single_photon)"
+ "print(\"Single Photon:\", single_photon)\n",
+ "print(f\"Processing {gh2_detector} Gotthard2.\")"
]
},
{
@@ -202,24 +205,7 @@
" single_photon=single_photon,\n",
" event_at=creation_time,\n",
" client=rest_cfg.calibration_client(),\n",
- ")\n",
- "\n",
- "# Keep as long as it is essential to correct\n",
- "# RAW data (FXE p003225) before the data mapping was added to CALCAT.\n",
- "try: # in case local constants are used with old RAW data. This can be removed in the future.\n",
- " da_to_pdu = g2_cal.mod_to_pdu\n",
- "except CalCatError as e:\n",
- " print(e)\n",
- " db_modules = [None] * len(karabo_da)\n",
- "\n",
- "if karabo_da == [\"\"]:\n",
- " karabo_da = sorted(da_to_pdu.keys())\n",
- "else:\n",
- " # Filter DA connected to detector in CALCAT\n",
- " karabo_da = [da for da in karabo_da if da in da_to_pdu]\n",
- " # Exclude non selected DA from processing.\n",
- "\n",
- "db_modules = [da_to_pdu[da] for da in karabo_da]"
+ ")"
]
},
{
@@ -229,12 +215,24 @@
"metadata": {},
"outputs": [],
"source": [
- "# Decide if GH2 is 25um or 50um\n",
- "gh2_hostname = run_dc.get_run_value(ctrl_src, \"rxHostname\")\n",
- "# gh2_hostname is a vector of bytes objects.\n",
- "# GH2 25um has two hostnames unlike 50um which has one.\n",
- "gh2_detector = \"25um\" if gh2_hostname[1].decode(\"utf-8\") else \"50um\"\n",
- "print(f\"Processing {gh2_detector} Gotthard2.\")\n",
+ "da_to_pdu = None\n",
+ "# Keep as long as it is essential to correct\n",
+ "# RAW data (FXE p003225) before the data mapping was added to CALCAT.\n",
+ "try: # in case local constants are used with old RAW data. This can be removed in the future.\n",
+ " da_to_pdu = g2_cal.mod_to_pdu\n",
+ "except CalCatError as e:\n",
+ " print(e)\n",
+ " db_modules = [None] * len(karabo_da)\n",
+ "\n",
+ "if da_to_pdu:\n",
+ "\n",
+ " if karabo_da == [\"\"]:\n",
+ " karabo_da = sorted(da_to_pdu.keys())\n",
+ " else:\n",
+ " # Exclude non selected DA from processing.\n",
+ " karabo_da = [da for da in karabo_da if da in da_to_pdu]\n",
+ "\n",
+ " db_modules = [da_to_pdu[da] for da in karabo_da]\n",
"\n",
"# Create the correction receiver name.\n",
"receivers = sorted(list(run_dc.select(f'{karabo_id}/DET/{receiver_template}*').all_sources))\n",
@@ -325,7 +323,6 @@
" if const_data[mod].get(\"BadPixelsFFGotthard2\") is not None:\n",
" bpix |= const_data[mod][\"BadPixelsFFGotthard2\"]\n",
" const_data[mod][\"Mask\"] = bpix\n",
- " print(const_data[mod].keys())\n",
"\n",
" # Prepare empty arrays for missing constants.\n",
" if const_data[mod].get(\"OffsetGotthard2\") is None:\n",
@@ -601,7 +598,7 @@
" [\"train_raw_data\", \"train_corr_data\"], [\"RAW\", \"CORRECTED\"]\n",
"):\n",
" fig, ax = plt.subplots(figsize=(15, 20))\n",
- " plt.rcParams.update({\"font.size\": 20})\n",
+ " plt.rcParams.update({\"font.size\": 15})\n",
"\n",
" heatmapPlot(\n",
" mod_dcs[corr_data_source][plt_data],\n",
diff --git a/src/cal_tools/gotthard2/gotthard2lib.py b/src/cal_tools/gotthard2/gotthard2lib.py
index 2d4ae564b2b634bb3728d601a8e4a5a33e45ccb1..f63790809db89d8d44c7fd84036e56111957a591 100644
--- a/src/cal_tools/gotthard2/gotthard2lib.py
+++ b/src/cal_tools/gotthard2/gotthard2lib.py
@@ -36,3 +36,14 @@ class Gotthard2Ctrl():
if "singlePhoton.value" in self.run_dc.keys_for_source(self.ctrl_src):
return bool(
self.run_dc[self.ctrl_src, "singlePhoton"].as_single_value())
+
+ def get_det_type(self):
+ """GH2 rxHostname is a vector of bytes objects.
+ GH2 25um has two host names unlike 50um which has one.
+
+ Returns:
+ str: return if its a 25um or 50um detector.
+ """
+
+ hostname = self.run_dc.get_run_value(self.ctrl_src, "rxHostname")
+ return "25um" if hostname[1].decode("utf-8") else "50um"