Use the new Instrument.from_string class method.

lsst · Mar 22, 2022 · 977e1c2 · 977e1c2
1 parent 15c5924
commit 977e1c2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/data/make_butler_repo.py b/tests/data/make_butler_repo.py
@@ -10,13 +10,13 @@
 
 import lsst.daf.butler
 from lsst.daf.butler.script import ingest_files
-import lsst.obs.base
+import lsst.pipe.base
 
 repopath = "cfht_minimal/repo"
 instrument = "lsst.obs.cfht.MegaPrime"
 lsst.daf.butler.Butler.makeRepo(repopath)
 butler = lsst.daf.butler.Butler(repopath, writeable=True)
-instrInstance = lsst.obs.base.utils.getInstrument(instrument)
+instrInstance = lsst.pipe.base.Instrument.from_string(instrument)
 instrInstance.register(butler.registry)
 
 graph = butler.registry.dimensions.extract(["htm7"])

diff --git a/tests/jointcalTestBase.py b/tests/jointcalTestBase.py
@@ -30,6 +30,7 @@
 from lsst.ctrl.mpexec import SimplePipelineExecutor
 import lsst.daf.butler
 from lsst.daf.butler.script import ingest_files
+import lsst.pipe.base
 import lsst.obs.base
 import lsst.geom
 from lsst.verify.bin.jobReporter import JobReporter
@@ -72,7 +73,7 @@ def importRepository(instrument, exportPath, exportFile, outputDir=None,
     _ = lsst.daf.butler.Butler.makeRepo(repopath)
     butler = lsst.daf.butler.Butler(repopath, writeable=True)
 
-    instrInstance = lsst.obs.base.utils.getInstrument(instrument)
+    instrInstance = lsst.pipe.base.utils.Instrument.from_string(instrument)
     instrInstance.register(butler.registry)
 
     # Register refcats first, so the `refcats` collection will exist.