Merge pull request #566 from lsst/tickets/DM-28583

DM-28583: Add method to get serialization version from on-disk Exposures.
lsst · Feb 18, 2021 · 1421380 · 1421380
2 parents 4d76ab3 + 53b7244
commit 1421380
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/include/lsst/afw/image/ExposureFitsReader.h b/include/lsst/afw/image/ExposureFitsReader.h
@@ -102,6 +102,12 @@ class ExposureFitsReader {
     lsst::geom::Point2I readXY0(lsst::geom::Box2I const &bbox = lsst::geom::Box2I(),
                                 ImageOrigin origin = PARENT);
 
+
+    /**
+     * Read the serialization version number from the header.
+     */
+    int readSerializationVersion();
+
     /**
      * Read the flexible metadata associated with the Exposure.
      *

diff --git a/python/lsst/afw/image/readers.cc b/python/lsst/afw/image/readers.cc
@@ -282,6 +282,7 @@ void declareExposureFitsReader(lsst::utils::python::WrapperCollection &wrappers)
         cls.def(py::init<fits::MemFileManager &>(), "manager"_a);
         declareCommonMethods(cls);
         declareMultiPlaneMethods(cls);
+        cls.def("readSerializationVersion", &ExposureFitsReader::readSerializationVersion);
         cls.def("readMetadata", &ExposureFitsReader::readMetadata);
         cls.def("readWcs", &ExposureFitsReader::readWcs);
         cls.def("readFilter", &ExposureFitsReader::readFilter);

diff --git a/src/image/ExposureFitsReader.cc b/src/image/ExposureFitsReader.cc
@@ -493,6 +493,11 @@ lsst::geom::Point2I ExposureFitsReader::readXY0(lsst::geom::Box2I const& bbox, I
     return _maskedImageReader.readXY0(bbox, origin);
 }
 
+int ExposureFitsReader::readSerializationVersion() {
+    _ensureReaders();
+    return _metadataReader->version;
+}
+
 std::string ExposureFitsReader::readImageDType() const { return _maskedImageReader.readImageDType(); }
 
 std::string ExposureFitsReader::readMaskDType() const { return _maskedImageReader.readMaskDType(); }

diff --git a/tests/test_readers.py b/tests/test_readers.py
@@ -179,6 +179,7 @@ def checkExposureFitsReader(self, exposureIn, fileName, dtypesOut):
         reader = ExposureFitsReader(fileName)
         self.assertIn('EXPINFO_V', reader.readMetadata().toDict(), "metadata is automatically versioned")
         reader.readMetadata().remove('EXPINFO_V')
+        self.assertGreaterEqual(reader.readSerializationVersion(), 0)
         self.assertEqual(exposureIn.getMetadata().toDict(), reader.readMetadata().toDict())
         self.assertWcsAlmostEqualOverBBox(exposureIn.getWcs(), reader.readWcs(), self.bbox,
                                           maxDiffPix=0, maxDiffSky=0*degrees)