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-30386: Make DRP wrapper task for DiaCalculation task #116

Merged
merged 3 commits into from
Jun 24, 2021
Merged

DM-30386: Make DRP wrapper task for DiaCalculation task #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b80087
Separate filter dependent plugins.
morriscb Jun 7, 2021
3d6ce55
Add check for filter not present in data.
morriscb Jun 7, 2021
a7e4c54
Remove diaCalculation and plugins from ap_association.
morriscb Jun 7, 2021
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
2 changes: 0 additions & 2 deletions python/lsst/ap/association/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
from .association import *
from .diaForcedSource import *
from .afwUtils import *
from .diaCalculation import *
from .diaCalculationPlugins import *
from .loadDiaCatalogs import *
from .packageAlerts import *
from .diaPipe import *
Expand Down
4 changes: 2 additions & 2 deletions python/lsst/ap/association/association.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
import lsst.pex.config as pexConfig
import lsst.pipe.base as pipeBase

from .diaCalculation import DiaObjectCalculationTask
from lsst.meas.base import DiaObjectCalculationTask

# Enforce an error for unsafe column/array value setting in pandas.
pd.options.mode.chained_assignment = 'raise'
Expand Down Expand Up @@ -167,7 +167,7 @@ def run(self,
diaObjects,
mergedDiaSourceHistory,
matchResult.associated_dia_object_ids,
filterName)
[filterName])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One question here: how are the filter name(s) passed? They're not already a list, are they? If I look at e.g. python/lsst/pipe/tasks/drpDiaCalculationPipe.py you have

self.config.filterNames

passed, so it's read from the config. In the actual config is it something like "u","g","r",... as opposed to ["u", "g", ...] my only concern was that you might unexpectedly get a list of lists somehow.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

filterName here comes from the diaSource catalog itself and will always be a string value here. If you look a few lines above this, it is where filterName is pulled. The pipeline here will only ever be run over one filter as it is designed to run in AP that is one ccdVisit at time. This one runs in the DiaPipeTask pipeline task vs the new wrapper.


allDiaObjects = updatedResults.diaObjectCat
updatedDiaObjects = updatedResults.updatedDiaObjects
Expand Down