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-22648: Add DcrModel to Gen3 butler #220

Merged
merged 2 commits into from
Jan 31, 2020
Merged

DM-22648: Add DcrModel to Gen3 butler #220

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
d2b8b3a
Initial addition of subfilter dimension
isullivan Dec 19, 2019
5410bc8
Add subfilter to datastore default template
isullivan Jan 16, 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 config/datastores/posixDatastore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ datastore:
# valid_first and valid_last here are YYYYMMDD; we assume we'll switch to
# MJD (DM-15890) before we need more than day resolution, since that's all
# Gen2 has.
default: "{collection}/{datasetType}.{component:?}/{tract:?}/{patch:?}/{label:?}/{abstract_filter:?}/{physical_filter:?}/{visit:?}/{datasetType}_{component:?}_{tract:?}_{patch:?}_{label:?}_{abstract_filter:?}_{physical_filter:?}_{calibration_label:?}_{visit:?}_{exposure:?}_{detector:?}_{instrument:?}_{skymap:?}_{skypix:?}_{run}"
default: "{collection}/{datasetType}.{component:?}/{tract:?}/{patch:?}/{label:?}/{abstract_filter:?}/{subfilter:?}/{physical_filter:?}/{visit:?}/{datasetType}_{component:?}_{tract:?}_{patch:?}_{label:?}_{abstract_filter:?}_{physical_filter:?}_{calibration_label:?}_{visit:?}_{exposure:?}_{detector:?}_{instrument:?}_{skymap:?}_{skypix:?}_{run}"
Copy link
Contributor

Choose a reason for hiding this comment

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

As you change this do you mind changing the default in config/datastores/s3Datastore.yaml as well? (I know... the duplication is not ideal... :(

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for catching this!

formatters: !include formatters.yaml
2 changes: 1 addition & 1 deletion config/datastores/s3Datastore.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ datastore:
# valid_first and valid_last here are YYYYMMDD; we assume we'll switch to
# MJD (DM-15890) before we need more than day resolution, since that's all
# Gen2 has.
default: "{collection}/{datasetType}.{component:?}/{tract:?}/{patch:?}/{label:?}/{abstract_filter:?}/{physical_filter:?}/{visit:?}/{datasetType}_{component:?}_{tract:?}_{patch:?}_{label:?}_{abstract_filter:?}_{physical_filter:?}_{calibration_label:?}_{visit:?}_{exposure:?}_{detector:?}_{instrument:?}_{skymap:?}_{skypix:?}_{run}"
default: "{collection}/{datasetType}.{component:?}/{tract:?}/{patch:?}/{label:?}/{abstract_filter:?}/{subfilter:?}/{physical_filter:?}/{visit:?}/{datasetType}_{component:?}_{tract:?}_{patch:?}_{label:?}_{abstract_filter:?}_{physical_filter:?}_{calibration_label:?}_{visit:?}_{exposure:?}_{detector:?}_{instrument:?}_{skymap:?}_{skypix:?}_{run}"
formatters: !include formatters.yaml
14 changes: 14 additions & 0 deletions config/dimensions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,20 @@ dimensions:
- abstract_filter
cached: true

subfilter:
doc: >
A mathematical division of an abstract_filter. Subfilters are used to
model wavelength-dependent effects such as differential chromatic
refraction.
keys:
-
name: name
type: string
length: 18
implies:
- abstract_filter
cached: true

detector:
doc: >
A detector associated with a particular instrument (not an observation
Expand Down
3 changes: 2 additions & 1 deletion tests/test_dimensions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ def checkGraphInvariants(self, graph):
def testConfigRead(self):
self.assertEqual(self.universe.dimensions.names,
{"instrument", "visit", "exposure", "detector", "physical_filter",
"abstract_filter", "calibration_label", "skymap", "tract", "patch", "htm7", "htm9"})
"abstract_filter", "subfilter", "calibration_label",
"skymap", "tract", "patch", "htm7", "htm9"})

def testGraphs(self):
self.checkGraphInvariants(self.universe.empty)
Expand Down