diff --git a/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC.ipynb b/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC.ipynb
index d71cd29ae29cce270f52aeb1afec9d58b2c6bb63..2f89983fefcb7c75f8a1ddc1bafe7ae9f8b86f95 100644
--- a/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC.ipynb
+++ b/notebooks/FastCCD/Characterize_Darks_NewDAQ_FastCCD_NBC.ipynb
@@ -44,7 +44,7 @@
"use_dir_creation_date = True # use dir creation date\n",
"bad_pixel_offset_sigma = 5. # offset standard deviations above which to consider pixel bad \n",
"bad_pixel_noise_sigma = 5. # noise standard deviations above which to consider pixel bad \n",
- "fix_temperature = 0. # fix temperature to this value in K, set to 0. if to keep the same"
+ "fix_temperature = 0. # fix temperature to this value, set to 0 to use slow control value"
]
},
{
@@ -372,7 +372,7 @@
"\n",
"metadata.detector_condition = condition\n",
"\n",
- "# specify the a version for this constant\n",
+ "# specify the version for this constant\n",
"if creation_time is None:\n",
" metadata.calibration_constant_version = Versions.Now(device=device)\n",
"else:\n",
diff --git a/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb b/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
index 98194d39a3a0baf1e548ca3906fefb16e4daea18..907644b79f454bd35938b051d0d712a4a709dd9c 100644
--- a/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
+++ b/notebooks/FastCCD/CorrectionNotebook_NewDAQ_FastCCD_NBC.ipynb
@@ -32,7 +32,7 @@
"h5path_cntrl = '/RUN/SCS_CDIDET_FCCD2M/DET/FCCD' # path to control data\n",
"cluster_profile = \"noDB\" #ipcluster profile to use\n",
"cpuCores = 16 #Specifies the number of running cpu cores\n",
- "operation_mode = \"FF\" #or \"FF\". FS stands for frame-store and FF for full-frame opeartion\n",
+ "operation_mode = \"FF\" # FS stands for frame-store and FF for full-frame opeartion\n",
"split_evt_primary_threshold = 7. # primary threshold for split event classification in terms of n sigma noise\n",
"split_evt_secondary_threshold = 4. # secondary threshold for split event classification in terms of n sigma noise\n",
"split_evt_mip_threshold = 1000. # MIP threshold for event classification\n",
@@ -50,6 +50,7 @@
"photon_energy_gain_map = 2. # energy in keV\n",
"fix_temperature = 233. # fix temperature to this value, set to 0 to use slow control value\n",
"flipped_between = [\"2019-02-01\", \"2019-04-02\"] # detector was flipped during this timespan\n",
+ "temp_limits = 5 # limits within which temperature is considered the same\n",
"\n",
"def balance_sequences(in_folder, run, sequences, sequences_per_node):\n",
" import glob\n",
@@ -305,7 +306,6 @@
"outputs": [],
"source": [
"offsetMap = None\n",
- "offset_temperature = None\n",
"badPixelMap = None\n",
"noiseMap = None\n",
"for i, g in enumerate([8, 2, 1]):\n",
@@ -324,8 +324,8 @@
"\n",
" for parm in condition.parameters:\n",
" if parm.name == \"Sensor Temperature\":\n",
- " parm.lower_deviation = 5\n",
- " parm.upper_deviation = 5\n",
+ " parm.lower_deviation = temp_limits\n",
+ " parm.upper_deviation = temp_limits\n",
"\n",
"\n",
" device = Detectors.fastCCD1\n",
@@ -335,7 +335,7 @@
"\n",
"\n",
"\n",
- " # specify the a version for this constant\n",
+ " # specify the version for this constant\n",
" if creation_time is None:\n",
" metadata.calibration_constant_version = Versions.Now(device=device)\n",
" metadata.retrieve(cal_db_interface)\n",
@@ -355,7 +355,7 @@
" if parm.name == \"Sensor Temperature\":\n",
" offset_temperature = parm.value\n",
"\n",
- " print(\"Temperature dark images for offset calculation \" +\n",
+ " print(\"Temperature of detector when dark images for offset calculation \" +\n",
" \"were taken at: {:0.2f} K @ {}\".format(offset_temperature,\n",
" metadata.calibration_constant_version.begin_at))\n",
"\n",
@@ -375,8 +375,8 @@
"\n",
" for parm in condition.parameters:\n",
" if parm.name == \"Sensor Temperature\":\n",
- " parm.lower_deviation = 5\n",
- " parm.upper_deviation = 5\n",
+ " parm.lower_deviation = temp_limits\n",
+ " parm.upper_deviation = temp_limits\n",
"\n",
"\n",
" device = Detectors.fastCCD1\n",
@@ -384,7 +384,7 @@
"\n",
" metadata.detector_condition = condition\n",
"\n",
- " # specify the a version for this constant\n",
+ " # specify the version for this constant\n",
" if creation_time is None:\n",
" metadata.calibration_constant_version = Versions.Now(device=device)\n",
" metadata.retrieve(cal_db_interface)\n",
@@ -414,8 +414,8 @@
"\n",
" for parm in condition.parameters:\n",
" if parm.name == \"Sensor Temperature\":\n",
- " parm.lower_deviation = 5\n",
- " parm.upper_deviation = 5\n",
+ " parm.lower_deviation = temp_limits\n",
+ " parm.upper_deviation = temp_limits\n",
"\n",
"\n",
" device = Detectors.fastCCD1\n",
@@ -423,11 +423,15 @@
"\n",
" metadata.detector_condition = condition\n",
"\n",
- " # specify the a version for this constant\n",
- " metadata.calibration_constant_version = Versions.Now(device=device)\n",
- " metadata.retrieve(cal_db_interface, timeout=cal_db_timeout)\n",
+ " # specify the version for this constant\n",
+ " if creation_time is None:\n",
+ " metadata.calibration_constant_version = Versions.Now(device=device)\n",
+ " metadata.retrieve(cal_db_interface)\n",
+ " else:\n",
+ " metadata.calibration_constant_version = Versions.Timespan(device=device,\n",
+ " start=creation_time)\n",
+ " metadata.retrieve(cal_db_interface, when=creation_time.isoformat(), timeout=3000000)\n",
"\n",
- " #badPixelMap = np.zeros_like(offsetMap).astype(np.uint32) #bpix.data\n",
" if badPixelMap is None:\n",
" badPixelMap = np.zeros(list(bpix.data.shape)+[3], np.uint32)\n",
" badPixelMap[...,i] = bpix.data\n",
@@ -812,9 +816,7 @@
" single_im = data[...,0]\n",
" \n",
" if do_pattern_classification:\n",
- " #with h5py.File(out_file, \"a\") as ofiled:\n",
- " #copy_and_sanitize_non_cal_data(infile, ofiled, h5path)\n",
- "\n",
+ " \n",
" ddsetcm = ofile.create_dataset(h5path+\"/pixels_cm\",\n",
" oshape,\n",
" chunks=(chunk_size_idim, oshape[1], oshape[2]),\n",
@@ -834,7 +836,7 @@
" patternClassifierLH._noisemap = noise[:x//2, :, :]\n",
" patternClassifierUH._noisemap = noise[x//2:, :, :]\n",
"\n",
- " data = cmCorrection.correct(data) #correct for the row common mode\n",
+ " data = cmCorrection.correct(data) # correct for the row common mode\n",
" ddsetcm[...] = np.moveaxis(data, 2, 0)\n",
"\n",
" dataLH = data[:x//2, :, :]\n",