diff --git a/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb b/notebooks/AGIPD/Characterize_AGIPD_Gain_Darks_NBC.ipynb index aa2f8ea5995742cb13998fec3c0a1dad7b87d874..25abaf2133a14f5c9abb9ff74a1e1a617f21972a 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 f490a0e02c2ea7524702f2a1543c446b5081df7a..42847f5dc0d7cc35b539ac5e8b2bf9fb54103b1f 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",