Merge pull request #462 from lsst/tickets/DM-39999

DM-39999: Add UC Davis Beam simulator ITL camera

policy/ucd/R21.yaml

@@ -0,0 +1,88 @@
+R21 :
+  detectorType : E2V
+  raftSerial : LCA-11021_RTM-E2V-21
+  ccdSerials :
+    S01 : E2V-CCD250-112-09
+
+  amplifiers :
+    S01 :
+      C10 : {
+        gain : 1.698,
+        readNoise : 8.7,
+        saturation : 200000,
+      }
+      C11 : {
+        gain : 1.677,
+        readNoise : 8.9,
+        saturation : 200000,
+      }
+      C12 : {
+        gain : 1.654,
+        readNoise : 8.8,
+        saturation : 200000,
+      }
+      C13 : {
+        gain : 1.654,
+        readNoise : 8.9,
+        saturation : 200000,
+      }
+      C14 : {
+        gain : 1.679,
+        readNoise : 9.8,
+        saturation : 200000,
+      }
+      C15 : {
+        gain : 1.667,
+        readNoise : 10.6,
+        saturation : 200000,
+      }
+      C16 : {
+        gain : 1.663,
+        readNoise : 8.8,
+        saturation : 200000,
+      }
+      C17 : {
+        gain : 1.681,
+        readNoise : 10.1,
+        saturation : 200000,
+      }
+      C07 : {
+        gain : 1.777,
+        readNoise : 6.3,
+        saturation : 200000,
+      }
+      C06 : {
+        gain : 1.779,
+        readNoise : 7.2,
+        saturation : 200000,
+      }
+      C05 : {
+        gain : 1.769,
+        readNoise : 155.4,
+        saturation : 200000,
+      }
+      C04 : {
+        gain : 1.766,
+        readNoise : 6.8,
+        saturation : 200000,
+      }
+      C03 : {
+        gain : 1.776,
+        readNoise : 6.8,
+        saturation : 200000,
+      }
+      C02 : {
+        gain : 1.758,
+        readNoise : 7.2,
+        saturation : 200000,
+      }
+      C01 : {
+        gain : 1.785,
+        readNoise : 8.2,
+        saturation : 200000,
+      }
+      C00 : {
+        gain : 1.783,
+        readNoise : 10.0,
+        saturation : 200000,
+      }

policy/ucd/R22.yaml

@@ -0,0 +1,88 @@
+R22 :
+  detectorType : ITL
+  raftSerial : LCA-11021_RTM-ITL-22
+  ccdSerials :
+    S01 : ITL-3800C-002
+
+  amplifiers :
+    S01 :
+      C10 : {
+        gain : 1.423,
+        readNoise : 8.7,
+        saturation : 200000,
+      }
+      C11 : {
+        gain : 1.422,
+        readNoise : 8.9,
+        saturation : 200000,
+      }
+      C12 : {
+        gain : 1.421,
+        readNoise : 8.8,
+        saturation : 200000,
+      }
+      C13 : {
+        gain : 1.430,
+        readNoise : 8.9,
+        saturation : 200000,
+      }
+      C14 : {
+        gain : 1.424,
+        readNoise : 9.8,
+        saturation : 200000,
+      }
+      C15 : {
+        gain : 1.424,
+        readNoise : 10.6,
+        saturation : 200000,
+      }
+      C16 : {
+        gain : 1.419,
+        readNoise : 8.8,
+        saturation : 200000,
+      }
+      C17 : {
+        gain : 1.0,
+        readNoise : 10.1,
+        saturation : 200000,
+      }
+      C07 : {
+        gain : 1.355,
+        readNoise : 6.3,
+        saturation : 200000,
+      }
+      C06 : {
+        gain : 1.464,
+        readNoise : 7.2,
+        saturation : 200000,
+      }
+      C05 : {
+        gain : 4.967,
+        readNoise : 155.4,
+        saturation : 200000,
+      }
+      C04 : {
+        gain : 1.455,
+        readNoise : 6.8,
+        saturation : 200000,
+      }
+      C03 : {
+        gain : 1.461,
+        readNoise : 6.8,
+        saturation : 200000,
+      }
+      C02 : {
+        gain : 1.454,
+        readNoise : 7.2,
+        saturation : 200000,
+      }
+      C01 : {
+        gain : 1.446,
+        readNoise : 8.2,
+        saturation : 200000,
+      }
+      C00 : {
+        gain : 1.442,
+        readNoise : 10.0,
+        saturation : 200000,
+      }

policy/ucd/rafts.yaml

@@ -1,16 +1,7 @@
-#
-# A list of all the rafts in the camera
-#
 rafts :
-  R00 :
-    offset : [0.0, 0.0]                 # offset of centre of raft, mm
+  R22 :
+    offset : [0.0, 0.0]                      # offset of centre of raft, mm
     id0 : 0                             # id for S00, incrementing uniformly
-  R01 :
-    offset : [0.0, 0.0]                 # offset of centre of raft, mm
-    id0 : 1                             # id for S00, incrementing uniformly
-  R02 :
-    offset : [0.0, 0.0]                 # offset of centre of raft, mm
-    id0 : 2                             # id for S00, incrementing uniformly
-  R03 :
-    offset : [0.0, 0.0]                 # offset of centre of raft, mm
-    id0 : 3                             # id for S00, incrementing uniformly
+  R21 :
+    offset : [0.0, 0.0]
+    id0 : 9

python/lsst/obs/lsst/_instrument.py

@@ -31,7 +31,7 @@
 from .filters import (LSSTCAM_FILTER_DEFINITIONS, LATISS_FILTER_DEFINITIONS,
                       LSSTCAM_IMSIM_FILTER_DEFINITIONS, TS3_FILTER_DEFINITIONS,
                       TS8_FILTER_DEFINITIONS, COMCAM_FILTER_DEFINITIONS,
-                      GENERIC_FILTER_DEFINITIONS,
+                      GENERIC_FILTER_DEFINITIONS, UCD_FILTER_DEFINITIONS,
                       )
 
 from .translators import LatissTranslator, LsstCamTranslator, \
@@ -296,11 +296,10 @@ def _make_default_dimension_packer(
 class LsstUCDCam(LsstCam):
     """Gen3 Butler specialization for UCDCam test stand data.
     """
-
+    filterDefinitions = UCD_FILTER_DEFINITIONS
     instrument = "LSST-UCDCam"
     policyName = "ucd"
     translatorClass = LsstUCDCamTranslator
-    filterDefinitions = GENERIC_FILTER_DEFINITIONS
     visitSystem = VisitSystem.ONE_TO_ONE
 
     def getRawFormatter(self, dataId):

python/lsst/obs/lsst/filters.py

@@ -27,6 +27,7 @@
     "TS8_FILTER_DEFINITIONS",
     "COMCAM_FILTER_DEFINITIONS",
     "GENERIC_FILTER_DEFINITIONS",
+    "UCD_FILTER_DEFINITIONS",
 )
 
 from lsst.obs.base import FilterDefinition, FilterDefinitionCollection
@@ -248,8 +249,17 @@ def addFilter(filter_dict, band, physical_filter):
     *BOTFilters,
     *CCOBFilters,
 )
+#
+# Filters in UC Davis Beam Simulator
+#
+UCDFilters = [
+    FilterDefinition(band="unknown", physical_filter="unknown")]
 
-
+UCD_FILTER_DEFINITIONS = FilterDefinitionCollection(
+    *NoFilterCollection,
+    *LsstCamFiltersGeneric,
+    *UCDFilters,
+)
 # LATISS filters include a grating in the name so we need to construct
 # filters for each combination of filter+grating.