From 85d9e7b98273ae642fda8fcbce2551069689b1a4 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Fri, 27 Nov 2020 17:39:00 +0100
Subject: [PATCH] [AGIPD][CORRECT] use yaml.dump and save only empty cons info
---
notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb | 2 +-
.../AGIPD_Retrieve_Constants_Precorrection.ipynb | 12 +++++-------
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
index 6bc8f66da..9d396f967 100644
--- a/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
+++ b/notebooks/AGIPD/AGIPD_Correct_and_Verify.ipynb
@@ -408,7 +408,7 @@
"const_yaml = None\n",
"if os.path.isfile(f'{out_folder}/retrieved_constants.yml'):\n",
" with open(f'{out_folder}/retrieved_constants.yml', \"r\") as f:\n",
- " const_yaml = yaml.load(f.read(), Loader=yaml.FullLoader)\n",
+ " const_yaml = yaml.safe_load(f.read())\n",
"\n",
"# retrive constants\n",
"def retrieve_constants(mod):\n",
diff --git a/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb b/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
index 8a2ded984..3e639c349 100644
--- a/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
+++ b/notebooks/AGIPD/AGIPD_Retrieve_Constants_Precorrection.ipynb
@@ -6,7 +6,7 @@
"source": [
"# AGIPD Retrieving Constants Pre-correction #\n",
"\n",
- "Author: K.Ahmed, Version: 1.0\n",
+ "Author: European XFEL Detector Group, Version: 1.0\n",
"\n",
"Retrieving Required Constants for Offline Calibration of the AGIPD Detector"
]
@@ -177,9 +177,7 @@
" modules = list(range(16))\n",
" karabo_da = [\"AGIPD{:02d}\".format(i) for i in modules]\n",
"else:\n",
- " modules = [int(x[-2:]) for x in karabo_da]\n",
- "\n",
- "\n"
+ " modules = [int(x[-2:]) for x in karabo_da]"
]
},
{
@@ -303,7 +301,7 @@
" f\"{mdata_const.filename}\"\n",
" mdata_dict[cname][\"creation-time\"] = f\"{mdata_const.begin_at}\"\n",
" else:\n",
- " mdata_dict[cname][\"file-path\"] = const_dict[cname]\n",
+ " mdata_dict[cname][\"file-path\"] = const_dict[cname][:2]\n",
" mdata_dict[cname][\"creation-time\"] = None\n",
" except Exception as e:\n",
" err = f\"Error: {e}, Traceback: {traceback.format_exc()}\"\n",
@@ -369,7 +367,7 @@
"# check if it is requested not to retrieve any constants from the database\n",
"if not nodb_with_dark:\n",
" with open(f\"{out_folder}/retrieved_constants.yml\", \"w\") as outfile:\n",
- " yaml.dump(mdata_dict, outfile)\n",
+ " yaml.safe_dump(mdata_dict, outfile)\n",
" print(\"\\nRetrieved constants for modules: \",\n",
" f\"{[', '.join([f'Q{x//4+1}M{x%4+1}' for x in modules])]}\")\n",
" print(f\"Operating conditions are:\\n• Bias voltage: {bias_voltage}\\n• Memory cells: {max_cells}\\n\"\n",
@@ -421,7 +419,7 @@
" seq_num = 0\n",
" \n",
"with open(f\"{out_folder}/retrieved_constants.yml\",\"r\") as fyml:\n",
- " time_summary = yaml.load(fyml)\n",
+ " time_summary = yaml.safe_load(fyml)\n",
" time_summary.update({\"time-summary\": {\n",
" \"SAll\":to_store\n",
" }})\n",
--
GitLab