DM-37950: Allow the raw definition to be specified in the instrument class

doc/changes/DM-37950.feature.rst

@@ -0,0 +1,2 @@
+An ``Instrument`` can now specify the dataset type definition that it would like to use for raw data.
+This can be done by setting the ``raw_definition`` class property to a tuple of the dataset type name, the dimensions to use for this dataset type, and the storage class name.

python/lsst/pipe/base/_instrument.py

@@ -65,6 +65,11 @@ class Instrument(metaclass=ABCMeta):
     """Instrument specific name to use when locating a policy or configuration
     file in the file system."""
 
+    raw_definition: tuple[str, tuple[str, ...], str] | None = None
+    """Dataset type definition to use for "raw" datasets. This is a tuple
+    of the dataset type name, a tuple of dimension names, and the storage class
+    name. If `None` the ingest system will use its default definition."""
+
     def __init__(self, collection_prefix: Optional[str] = None):
         if collection_prefix is None:
             collection_prefix = self.getName()

tests/test_instrument.py

@@ -53,6 +53,8 @@ def getRawFormatter(self, dataId):
 class BadInstrument(DummyInstrument):
     """Instrument with wrong class name."""
 
+    raw_definition = ("raw2", ("instrument", "detector", "exposure"), "StructuredDataDict")
+
     @classmethod
     def getName(cls):
         return "BadInstrument"
@@ -94,6 +96,9 @@ def setUp(self):
     def test_basics(self):
         self.assertEqual(self.instrument.getName(), self.name)
         self.assertEqual(self.instrument.getRawFormatter({}), JsonFormatter)
+        self.assertIsNone(DummyInstrument.raw_definition)
+        raw = BadInstrument.raw_definition
+        self.assertEqual(raw[2], "StructuredDataDict")
 
     def test_register(self):
         """Test that register() sets appropriate Dimensions."""

tests/test_quantumGraph.py

@@ -43,17 +43,6 @@
 from lsst.pipe.base.graph.quantumNode import QuantumNode
 from lsst.utils.introspection import get_full_type_name
 
-try:
-    import boto3
-    from moto import mock_s3
-except ImportError:
-    boto3 = None
-
-    def mock_s3(cls):
-        """A no-op decorator in case moto mock_s3 can not be imported."""
-        return cls
-
-
 METADATA = {"a": [1, 2, 3]}