Skip to content

DM-51732: Relax the WCS comparison for CModel #117

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

Draft
wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

DM-51732: Relax the WCS comparison for CModel #117

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bc580dd
Relax the WCS comparison for CModel
arunkannawadi Sep 26, 2025
3d9a40c
Add a logger to cModel plugin
arunkannawadi Oct 1, 2025
91ef083
fixup: log warning
arunkannawadi Oct 1, 2025
fb3a8d3
fixup: import logging
arunkannawadi Oct 1, 2025
3250700
isort imports
arunkannawadi Oct 1, 2025
0fd6c72
log level debug
arunkannawadi Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 17 additions & 8 deletions python/lsst/meas/modelfit/cmodel/cmodelContinued.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
# The Plugin classes here are accessed via registries, not direct imports.
__all__ = ("CModelStageConfig", "CModelConfig")

from .._modelfitLib import CModelStageControl, CModelControl, CModelAlgorithm
import logging

from lsst.pex.config import makeConfigClass
import lsst.meas.base
from lsst.pex.config import makeConfigClass

from .._modelfitLib import CModelAlgorithm, CModelControl, CModelStageControl

CModelStageConfig = makeConfigClass(CModelStageControl)
CModelConfig = makeConfigClass(CModelControl)
Expand Down Expand Up @@ -90,21 +91,29 @@ class CModelForcedPlugin(lsst.meas.base.ForcedPlugin):
as well as the exp, dev, and combined exp+dev fits
"""
ConfigClass = CModelForcedConfig
hasLogName = True

@staticmethod
def getExecutionOrder():
return 3.0

def __init__(self, config, name, schemaMapper, metadata):
lsst.meas.base.ForcedPlugin.__init__(self, config, name, schemaMapper, metadata)
def __init__(self, config, name, schemaMapper, metadata, logName=None):
lsst.meas.base.ForcedPlugin.__init__(self, config, name, schemaMapper, metadata, logName=logName)
self.algorithm = CModelAlgorithm(name, config.makeControl(), schemaMapper)

def measure(self, measRecord, exposure, refRecord, refWcs):
if refWcs != exposure.getWcs():
raise lsst.meas.base.FatalAlgorithmError(
"CModel forced measurement currently requires the measurement image to have the same"
" Wcs as the reference catalog (this is a temporary limitation)."
)
if str(refWcs) == str(exposure.getWcs()):
logger = logging.getLogger(self.getLogName())
logger.debug(
"The measurement and reference WCS are not equal, but have the same"
"string representation."
)
else:
raise lsst.meas.base.FatalAlgorithmError(
"CModel forced measurement currently requires the measurement image to have the same"
" Wcs as the reference catalog (this is a temporary limitation)."
)
self.algorithm.measure(measRecord, exposure, refRecord)

def fail(self, measRecord, error=None):
Expand Down