Remove gen3 from module hierarchy

lsst · Mar 25, 2020 · 45620f9 · 45620f9
1 parent 6f9a242
commit 45620f9
Show file tree

Hide file tree

Showing 13 changed files with 25 additions and 119 deletions.
diff --git a/config/hsc/convertRepo.py b/config/hsc/convertRepo.py
@@ -4,7 +4,7 @@
 
 # Register translators for data IDs.  This is unfortunately a bit fragile; it
 # probably won't survive persisting the config.
-import lsst.obs.subaru.gen3.hsc.gen2to3
+import lsst.obs.subaru.gen2to3
 
 config.runs["raw"] = "raw/hsc"
 config.runs["brightObjectMask"] = "masks/hsc"

diff --git a/config/hsc/ingest-gen3.py b/config/hsc/ingest-gen3.py
@@ -1,2 +1,2 @@
 config.padRegionAmount = 4000
-config.instrument = "lsst.obs.subaru.gen3.hsc.HyperSuprimeCam"
+config.instrument = "lsst.obs.subaru.HyperSuprimeCam"
diff --git a/python/lsst/obs/subaru/__init__.py b/python/lsst/obs/subaru/__init__.py
@@ -28,3 +28,5 @@
 from . import filterFraction
 # This module is distinct from the crosstalk Python module
 from ._crosstalk import *
+
+from .instrument import *
diff --git a/python/lsst/obs/subaru/gen3/hsc/gen2to3.py → python/lsst/obs/subaru/gen2to3.py b/python/lsst/obs/subaru/gen3/hsc/gen2to3.py → python/lsst/obs/subaru/gen2to3.py
@@ -24,7 +24,7 @@
 
 from lsst.obs.base.gen2to3 import Translator, KeyHandler, ConstantKeyHandler, CopyKeyHandler
 
-from ....hsc.hscFilters import HSC_FILTER_DEFINITIONS
+from ..hsc.hscFilters import HSC_FILTER_DEFINITIONS
 
 
 __all__ = ()

diff --git a/python/lsst/obs/subaru/gen3/__init__.py b/python/lsst/obs/subaru/gen3/__init__.py
diff --git a/python/lsst/obs/subaru/gen3/hsc/__init__.py b/python/lsst/obs/subaru/gen3/hsc/__init__.py
diff --git a/python/lsst/obs/subaru/gen3/suprimecam/__init__.py b/python/lsst/obs/subaru/gen3/suprimecam/__init__.py
diff --git a/python/lsst/obs/subaru/gen3/suprimecam/rawFormatter.py b/python/lsst/obs/subaru/gen3/suprimecam/rawFormatter.py
diff --git a/...on/lsst/obs/subaru/gen3/hsc/instrument.py → python/lsst/obs/subaru/instrument.py b/...on/lsst/obs/subaru/gen3/hsc/instrument.py → python/lsst/obs/subaru/instrument.py
@@ -36,11 +36,11 @@
 from lsst.obs.base import Instrument, addUnboundedCalibrationLabel
 from lsst.pipe.tasks.read_curated_calibs import read_all
 
-from lsst.obs.hsc.hscPupil import HscPupilFactory
-from lsst.obs.hsc.hscFilters import HSC_FILTER_DEFINITIONS
-from lsst.obs.hsc.makeTransmissionCurves import (getSensorTransmission, getOpticsTransmission,
-                                                 getFilterTransmission, getAtmosphereTransmission)
-from lsst.obs.subaru.strayLight.formatter import SubaruStrayLightDataFormatter
+from ..hsc.hscPupil import HscPupilFactory
+from ..hsc.hscFilters import HSC_FILTER_DEFINITIONS
+from ..hsc.makeTransmissionCurves import (getSensorTransmission, getOpticsTransmission,
+                                          getFilterTransmission, getAtmosphereTransmission)
+from .strayLight.formatter import SubaruStrayLightDataFormatter
 
 log = logging.getLogger(__name__)
 

diff --git a/.../lsst/obs/subaru/gen3/hsc/rawFormatter.py → python/lsst/obs/subaru/rawFormatter.py b/.../lsst/obs/subaru/gen3/hsc/rawFormatter.py → python/lsst/obs/subaru/rawFormatter.py
@@ -26,10 +26,13 @@
 from lsst.obs.base.fitsRawFormatterBase import FitsRawFormatterBase
 from astro_metadata_translator import HscTranslator
 
-from ....hsc.hscFilters import HSC_FILTER_DEFINITIONS
+from ..hsc.hscFilters import HSC_FILTER_DEFINITIONS
 from . import HyperSuprimeCam
 
-__all__ = ("HyperSuprimeCamRawFormatter", "HyperSuprimeCamCornerRawFormatter")
+from ..suprimecam.makeSuprimecamRawVisitInfo import MakeSuprimecamRawVisitInfo
+
+__all__ = ("HyperSuprimeCamRawFormatter", "HyperSuprimeCamCornerRawFormatter",
+           "SuprimeCamRawFormatter")
 
 
 class HyperSuprimeCamRawFormatter(FitsRawFormatterBase):
@@ -67,3 +70,10 @@ class HyperSuprimeCamCornerRawFormatter(HyperSuprimeCamRawFormatter):
 
     FLIP_LR = False
     FLIP_TB = True
+
+
+class SuprimeCamRawFormatter(FitsRawFormatterBase):
+
+    def makeVisitInfo(self, header):
+        maker = MakeSuprimecamRawVisitInfo()
+        return maker(header)
diff --git a/tests/test_convert2to3.py b/tests/test_convert2to3.py
@@ -76,7 +76,7 @@ def setUp(self):
         self.gen2calib = os.path.join(testDataDirectory, 'hsc/calib')
         self.gen2root = createGen2Repo(rawpath)
         self.instrumentName = "HSC"
-        self.instrumentClass = "lsst.obs.subaru.gen3.hsc.HyperSuprimeCam"
+        self.instrumentClass = "lsst.obs.subaru.HyperSuprimeCam"
         self.config = os.path.join(os.path.abspath(os.path.dirname(__file__)),
                                    "config", "convert2to3Config.py")
 

diff --git a/tests/test_ingest.py b/tests/test_ingest.py
@@ -27,7 +27,7 @@
 import lsst.utils.tests
 
 from lsst.obs.base.ingest_tests import IngestTestBase
-from lsst.obs.subaru.gen3.hsc import HyperSuprimeCam
+from lsst.obs.subaru import HyperSuprimeCam
 
 testDataPackage = "testdata_subaru"
 try:

diff --git a/tests/test_instrument.py b/tests/test_instrument.py
@@ -25,7 +25,6 @@
 import unittest
 
 import lsst.utils.tests
-import lsst.obs.subaru.gen3.hsc
 from lsst.obs.base.instrument_tests import InstrumentTests, InstrumentTestData
 
 
@@ -60,7 +59,7 @@ def setUp(self):
                                        firstDetectorName="1_53",
                                        physical_filters=physical_filters)
 
-        self.instrument = lsst.obs.subaru.gen3.hsc.HyperSuprimeCam()
+        self.instrument = lsst.obs.subaru.HyperSuprimeCam()
 
 
 class MemoryTester(lsst.utils.tests.MemoryTestCase):