Skip to content
Snippets Groups Projects
Commit 1a53b90e authored by Karim Ahmed's avatar Karim Ahmed
Browse files

consider illuminated conditions for pnCCD

parent b5fd3784
No related branches found
No related tags found
1 merge request!738New calcat interface
This commit is part of merge request !774. Comments created here will be created in the context of that merge request.
...@@ -303,7 +303,6 @@ class CalCatApi(metaclass=ClientWrapper): ...@@ -303,7 +303,6 @@ class CalCatApi(metaclass=ClientWrapper):
for ccv in resp_versions["data"]: for ccv in resp_versions["data"]:
try: try:
mod = da_to_modname[ccv['physical_detector_unit']['karabo_da']] mod = da_to_modname[ccv['physical_detector_unit']['karabo_da']]
print(mod)
except KeyError: except KeyError:
# Not included in our modules # Not included in our modules
continue continue
...@@ -1139,15 +1138,20 @@ class JUNGFRAU_CalibrationData(CalibrationData): ...@@ -1139,15 +1138,20 @@ class JUNGFRAU_CalibrationData(CalibrationData):
return cond return cond
class PNCCD_CalibrationData(CalibrationData): class PNCCD_CalibrationData(SplitConditionCalibrationData):
calibrations = { """Calibration data for the pnCCD detector."""
dark_calibrations = {
"OffsetCCD", "OffsetCCD",
"BadPixelsDarkCCD", "BadPixelsDarkCCD",
"NoiseCCD", "NoiseCCD",
}
illuminated_calibrations = {
"RelativeGainCCD", "RelativeGainCCD",
"CTECCD", "CTECCD",
} }
parameters = [
dark_parameters = [
"Sensor Bias Voltage", "Sensor Bias Voltage",
"Memory cells", "Memory cells",
"Pixels X", "Pixels X",
...@@ -1157,6 +1161,8 @@ class PNCCD_CalibrationData(CalibrationData): ...@@ -1157,6 +1161,8 @@ class PNCCD_CalibrationData(CalibrationData):
"Gain Setting", "Gain Setting",
] ]
illuminated_parameters = dark_parameters + ["Source energy"]
def __init__( def __init__(
self, self,
detector_name, detector_name,
...@@ -1164,6 +1170,7 @@ class PNCCD_CalibrationData(CalibrationData): ...@@ -1164,6 +1170,7 @@ class PNCCD_CalibrationData(CalibrationData):
integration_time, integration_time,
sensor_temperature, sensor_temperature,
gain_setting, gain_setting,
source_energy=9.2,
pixels_x=1024, pixels_x=1024,
pixels_y=1024, pixels_y=1024,
modules=None, modules=None,
...@@ -1187,9 +1194,11 @@ class PNCCD_CalibrationData(CalibrationData): ...@@ -1187,9 +1194,11 @@ class PNCCD_CalibrationData(CalibrationData):
self.integration_time = integration_time self.integration_time = integration_time
self.sensor_temperature = sensor_temperature self.sensor_temperature = sensor_temperature
self.gain_setting = gain_setting self.gain_setting = gain_setting
self.source_energy = source_energy
class EPIX100_CalibrationData(SplitConditionCalibrationData): class EPIX100_CalibrationData(SplitConditionCalibrationData):
"""Calibration data for the ePix100 detector."""
dark_calibrations = { dark_calibrations = {
"OffsetEPix100", "OffsetEPix100",
"NoiseEPix100", "NoiseEPix100",
...@@ -1245,6 +1254,8 @@ class EPIX100_CalibrationData(SplitConditionCalibrationData): ...@@ -1245,6 +1254,8 @@ class EPIX100_CalibrationData(SplitConditionCalibrationData):
class GOTTHARD2_CalibrationData(CalibrationData): class GOTTHARD2_CalibrationData(CalibrationData):
"""Calibration data for the Gotthard II detector."""
calibrations = { calibrations = {
"LUTGotthard2" "OffsetGotthard2", "LUTGotthard2" "OffsetGotthard2",
"NoiseGotthard2", "NoiseGotthard2",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment