From 0434e4de7d27e146e93916199e999ba0f3c949b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Le=20Guyader?= <loic.le.guyader@xfel.eu>
Date: Fri, 12 Apr 2019 23:49:02 +0200
Subject: [PATCH] Update calibration to one file and new fields for mask, gain,
and common mode correction
---
Load.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/Load.py b/Load.py
index 2ced1ef..9525882 100644
--- a/Load.py
+++ b/Load.py
@@ -119,10 +119,15 @@ mnemonics = {
'key':'actual_current.value',
'dim':None},
- # FastCCD
+ # FastCCD, if in raw folder, raw images
+ # if in proc folder, dark substracted and relative gain corrected
"fastccd": {'source':'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',
'key':'data.image.pixels',
'dim':['x', 'y']},
+ # FastCCD with common mode correction
+ "fastccd_cm": {'source':'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',
+ 'key':'data.image.pixels_cm',
+ 'dim':['x', 'y']},
# FastCCD charge split correction in very low photon count regime
"fastccd_classified": {'source':'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',
'key':'data.image.pixels_classified',
@@ -137,6 +142,14 @@ mnemonics = {
"fastccd_patterns": {'source':'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',
'key':'data.image.patterns',
'dim':['x', 'y']},
+ # FastCCD gain map, 0 high gain, 1 medium gain, 2, low gain
+ "fastccd_gain": {'source':'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',
+ 'key':'data.image.gain',
+ 'dim':['x', 'y']},
+ # FastCCD mask, bad pixel map to be ignored if > 0
+ "fastccd_mask": {'source':'SCS_CDIDET_FCCD2M/DAQ/FCCD:daqOutput',
+ 'key':'data.image.mask',
+ 'dim':['x', 'y']},
# TIM
"MCP1apd": {'source':'SCS_UTC1_ADQ/ADC/1:network',
--
GitLab