From 70da98a9b605f6aeb05b90f5d8b875a3f8c8c679 Mon Sep 17 00:00:00 2001
From: ahmedk <karim.ahmed@xfel.eu>
Date: Tue, 5 Apr 2022 15:47:36 +0200
Subject: [PATCH] remove psutils dep and set 550 as max-trains
---
.../AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb | 11 +++++++----
setup.py | 1 -
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
index aa2f8ea59..25abaf213 100644
--- a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
+++ b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb
@@ -64,7 +64,7 @@
"thresholds_noise_hard_lg = [4, 20] # Low-gain thresholds in absolute ADU terms for offset deduced bad pixels\n",
"\n",
"thresholds_gain_sigma = 5. # Gain separation sigma threshold\n",
- "max_trains = 0 # Maximum number of trains to use for processing dark. Set to 0 to process all available trains.\n",
+ "max_trains = 550 # Maximum number of trains to use for processing dark. Set to 0 to process all available trains. 550 added for ~500GB nodes to temporarely avoid memory issues.\n",
"min_trains = 1 # Miniumum number of trains for processing dark. If run folder has less than minimum trains, processing is stopped.\n",
"high_res_badpix_3d = False # set this to True if you need high-resolution 3d bad pixel plots. ~7mins extra time for 64 memory cells\n",
"\n",
@@ -222,12 +222,15 @@
" n_trains = len(dc.train_ids)\n",
"\n",
" if n_trains == 0:\n",
- " print(f\"WARNING: No images for module AGIPD{m:02d}.\")\n",
+ " print(f\"WARNING: No images for module AGIPD{m:02d}, run {run_dict['number']}.\")\n",
" missing_modules.append(m)\n",
- "\n",
" # Raise a warning if the module has less trains than expected.\n",
" elif n_trains < min_trains:\n",
- " print(f\"WARNING: {dc.files} for AGIPD{m:02d} have less than minimum trains: {min_trains}.\")\n",
+ " print(f\"WARNING: AGIPD{m:02d}, run {run_dict['number']} \"\n",
+ " f\"has trains less than minimum trains: {min_trains}.\")\n",
+ " else:\n",
+ " print(f\"Processing {max_trains if max_trains < n_trains else n_trains} \"\n",
+ " f\"for AGIPD{m:02d}, run {run_dict['number']} \")\n",
"\n",
" n_trains_list.append(n_trains)\n",
"\n",
diff --git a/setup.py b/setup.py
index f490a0e02..42847f5dc 100644
--- a/setup.py
+++ b/setup.py
@@ -78,7 +78,6 @@ install_requires = [
"pasha==0.1.1",
"prettytable==0.7.2",
"princess==0.5",
- "psutil==5.9.0",
"pypandoc==1.4",
"python-dateutil==2.8.1",
"pyyaml==5.3",
--
GitLab