From b44b885b54e73490f3b1fdfeb5280311081c37c0 Mon Sep 17 00:00:00 2001
From: Karim Ahmed <karim.ahmed@xfel.eu>
Date: Tue, 10 Sep 2019 09:36:14 +0200
Subject: [PATCH] changing fix_temp from bool to float
---
..._Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb b/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
index 97e862ab6..9b804c114 100644
--- a/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
+++ b/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC_New_Common_Mode.ipynb
@@ -45,7 +45,7 @@
"bad_pixel_offset_sigma = 5. # Any pixel whose offset is beyond 5 standard deviations, is a bad pixel\n",
"bad_pixel_noise_sigma = 5. # Any pixel whose noise is beyond 5 standard deviations, is a bad pixel\n",
"sigmaNoise = 5. # Any pixel whose signal exceeds 'sigmaNoise'*noiseCM (common mode corrected noise) will be masked\n",
- "fix_temperature = False # This is required when the temperature is fixed in calibration database\n",
+ "fix_temperature = 0. # This is required when the temperature is fixed in calibration database\n",
"temperature_k = 233 # This is only used in the case of a fixed temperature for the calibration database\n",
"chunkSize = 100 # Number of images to read per chunk\n",
"cpuCores = 40 # Specifies the number of running cpu cores\n",
@@ -219,15 +219,17 @@
"\n",
"print(\"Bias voltage is {} V\".format(bias_voltage))\n",
"print(\"Detector gain is set to x{}\".format(det_gain), \"({} gain)\".format(gain_setting))\n",
- "print(\"Detector integration time is set to {}\".format(integration_time), 'ms') \n",
- " \n",
- "if fix_temperature:\n",
+ "print(\"Detector integration time is set to {}\".format(integration_time), 'ms')\n",
+ "\n",
+ "temperature_k = fix_temperature + 273.15\n",
+ "if fix_temperature != 0.:\n",
" print(\"Using a fixed temperature of {}\".format(temperature_k), \"K\")\n",
- " print(\"Mean temperature was {:0.2f} °C / {:0.2f} K\".format(temperature, temperature + 273.15))\n",
"else:\n",
+ " # This is needed while sending the \n",
+ " # calibration constant to the DB later\n",
" temperature_k = temperature + 273.15\n",
" print(\"Temperature is not fixed.\")\n",
- " print(\"Mean temperature was {:0.2f} °C / {:0.2f} K\".format(temperature, temperature_k))\n",
+ "print(\"Mean temperature was {:0.2f} °C / {:0.2f} K\".format(temperature, temperature + 273.15))\n",
"\n",
"print(\"Output: {}\".format(out_folder))"
]
--
GitLab