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-26738: Rename abstract_filter to band #104

Merged
merged 2 commits into from
Sep 25, 2020
Merged

DM-26738: Rename abstract_filter to band #104

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
6fc2e8c
Rename abstract_filter to band
timj Sep 23, 2020
1575ff4
Adapt test expectations to new imSim filter conventions.
TallJimbo Sep 23, 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
2 changes: 1 addition & 1 deletion doc/lsst.ap.verify/command-line-reference.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Required arguments are :option:`--dataset` and :option:`--output`.

Specify data ID to process.
If using :option:`--gen2`, this should use :doc:`data ID syntax </modules/lsst.pipe.base/command-line-task-dataid-howto>`, such as ``--id "visit=12345 ccd=1..6 filter=g"``.
If using :option:`--gen3`, this should use :ref:`dimension expression syntax <daf_butler_dimension_expressions>`, such as ``--id "visit=12345 and detector in (1..6) and abstract_filter='g'"``.
If using :option:`--gen3`, this should use :ref:`dimension expression syntax <daf_butler_dimension_expressions>`, such as ``--id "visit=12345 and detector in (1..6) and band='g'"``.

Multiple copies of this argument are allowed.
For compatibility with the syntax used by command line tasks, ``--id`` with no argument processes all data IDs.
Expand Down
2 changes: 1 addition & 1 deletion doc/lsst.ap.verify/running.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ The command for running the pipeline on Gen 3 data is almost identical to Gen 2:

.. prompt:: bash

ap_verify.py --dataset HiTS2015 --gen3 --id "visit in (412518, 412568) and abstract_filter='g'" --output workspaces/hits/
ap_verify.py --dataset HiTS2015 --gen3 --id "visit in (412518, 412568) and band='g'" --output workspaces/hits/

The only differences are substituting :option:`--gen3` for :option:`--gen2`, and formatting the (optional) data ID in the :ref:`Gen 3 query syntax <daf_butler_dimension_expressions>`.

Expand Down
6 changes: 3 additions & 3 deletions tests/test_ingestion.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ def setUpClass(cls):

cls.testApVerifyData = os.path.join('tests', 'ingestion')

cls.rawData = [{'file': 'lsst_a_204595_R11_S01_i.fits', 'expId': 204595, 'filter': 'i',
cls.rawData = [{'file': 'lsst_a_204595_R11_S01_i.fits', 'expId': 204595, 'filter': 'i_sim_1.4',
'exptime': 30.0},
]
cls.calibData = [{'type': 'bias', 'file': 'bias-R11-S01-det037_2022-01-01.fits.gz',
'filter': 'NONE', 'date': '2022-01-01'},
{'type': 'flat', 'file': 'flat_i-R11-S01-det037_2022-08-06.fits.gz',
'filter': 'i', 'date': '2022-08-06'},
'filter': 'i_sim_1.4', 'date': '2022-08-06'},
]

@staticmethod
Expand Down Expand Up @@ -328,7 +328,7 @@ def setUpClass(cls):
'detector': cls.DETECTOR_ID, 'instrument': cls.INSTRUMENT},
{'type': 'flat', 'file': 'flat_i-R11-S01-det037_2022-08-06.fits.gz',
'detector': cls.DETECTOR_ID, 'instrument': cls.INSTRUMENT,
'physical_filter': 'i'},
'physical_filter': 'i_sim_1.4'},
]

@classmethod
Expand Down