Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DM-24584: create an ingestRaws butler command #208

Merged
merged 2 commits into from
May 13, 2020
Merged

DM-24584: create an ingestRaws butler command #208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a5961e
change to abstractmethod
n8pease May 9, 2020
4aa43d7
conform to changes in ingest_tests
n8pease May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
70 changes: 49 additions & 21 deletions tests/test_butlerCmd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,45 +29,73 @@


class TestButlerCmdLsstComCam(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.LsstComCam"
self.instrument_name = "LSSTComCam"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.LsstComCam"

@staticmethod
def instrumentName():
return "LSSTComCam"


class TestButlerCmdLsstImSim(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.LsstImSim"
self.instrument_name = "LSST-ImSim"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.LsstImSim"

@staticmethod
def instrumentName():
return "LSST-ImSim"


class TestButlerCmdLsstPhoSim(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.LsstPhoSim"
self.instrument_name = "LSST-PhoSim"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.LsstPhoSim"

@staticmethod
def instrumentName():
return "LSST-PhoSim"


class TestButlerCmdLsstTS8(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.LsstTS8"
self.instrument_name = "LSST-TS8"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.LsstTS8"

@staticmethod
def instrumentName():
return "LSST-TS8"


class TestButlerCmdLsstUCDCam(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.LsstUCDCam"
self.instrument_name = "LSST-UCDCam"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.LsstUCDCam"

@staticmethod
def instrumentName():
return "LSST-UCDCam"


class TestButlerCmdLsstTS3(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.LsstTS3"
self.instrument_name = "LSST-TS3"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.LsstTS3"

@staticmethod
def instrumentName():
return "LSST-TS3"


class TestButlerCmdLatiss(ButlerCmdTestBase, lsst.utils.tests.TestCase):
def setUp(self):
self.instrument_class = "lsst.obs.lsst.Latiss"
self.instrument_name = "LATISS"
@staticmethod
def instrumentClass():
return "lsst.obs.lsst.Latiss"

@staticmethod
def instrumentName():
return "LATISS"


def setup_module(module):
Expand Down
6 changes: 4 additions & 2 deletions tests/test_ingest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ class LatissIngestTestCase(IngestTestBase, lsst.utils.tests.TestCase):

def setUp(self):
self.ingestDir = TESTDIR
self.instrument = lsst.obs.lsst.Latiss()
self.instrument = "lsst.obs.lsst.Latiss"
self.instrumentName = "LATISS"
self.file = os.path.join(DATAROOT, "latiss", "raw", "2018-09-20",
"3018092000065-det000.fits")
self.dataIds = [dict(instrument="LATISS", exposure=3018092000065, detector=0)]
Expand All @@ -51,7 +52,8 @@ class Ts3IngestTestCase(IngestTestBase, lsst.utils.tests.TestCase):

def setUp(self):
self.ingestDir = TESTDIR
self.instrument = lsst.obs.lsst.LsstTS3()
self.instrument = "lsst.obs.lsst.LsstTS3"
self.instrumentName = "LSST-TS3"
self.file = os.path.join(DATAROOT, "ts3", "raw", "2018-11-15",
"201811151255111-R433-S00-det433.fits")
self.dataIds = [dict(instrument="LSST-TS3", exposure=201811151255111, detector=433)]
Expand Down