Merge pull request #76 from lsst/tickets/DM-24355

DM-24355: Make Instrument registration idempotent.
lsst · Oct 16, 2020 · cea5c83 · cea5c83
2 parents a651515 + 5ac7580
commit cea5c83
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/python/lsst/obs/cfht/_instrument.py b/python/lsst/obs/cfht/_instrument.py
@@ -70,27 +70,29 @@ def _getCameraFromPath(path):
     def register(self, registry):
         camera = self.getCamera()
         obsMax = 2**31
-        registry.insertDimensionData(
-            "instrument",
-            {"name": self.getName(), "detector_max": 36, "visit_max": obsMax, "exposure_max": obsMax,
-             "class_name": getFullTypeName(self),
-             }
-        )
-
-        for detector in camera:
-            registry.insertDimensionData(
-                "detector",
+        with registry.transaction():
+            registry.syncDimensionData(
+                "instrument",
                 {
-                    "instrument": self.getName(),
-                    "id": detector.getId(),
-                    "full_name": detector.getName(),
-                    "name_in_raft": detector.getName(),
-                    "raft": None,  # MegaPrime does not have rafts
-                    "purpose": str(detector.getType()).split(".")[-1],
+                    "name": self.getName(), "detector_max": 36, "visit_max": obsMax, "exposure_max": obsMax,
+                    "class_name": getFullTypeName(self),
                 }
             )
 
-        self._registerFilters(registry)
+            for detector in camera:
+                registry.syncDimensionData(
+                    "detector",
+                    {
+                        "instrument": self.getName(),
+                        "id": detector.getId(),
+                        "full_name": detector.getName(),
+                        "name_in_raft": detector.getName(),
+                        "raft": None,  # MegaPrime does not have rafts
+                        "purpose": str(detector.getType()).split(".")[-1],
+                    }
+                )
+
+            self._registerFilters(registry)
 
     def getRawFormatter(self, dataId):
         # local import to prevent circular dependency