DM-46586: Modify embargo-butler auto-ingest to handle photodiode files #60
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
LSSTCam is the only instrument with photodiode data that may need to be ingested. An example of the photodiode file path is rubinobs-lfa-cp/MTCamera/photodiode/20240928/MC_C_20240928_002826_photodiode.ecsv
hsinfang
force-pushed
the
tickets/DM-46586
branch
from
2986a4e
to
fb4f951
Compare
ktlim
approved these changes
Oct 9, 2024
| @@ -8,14 +8,14 @@ and automatically ingest them into an appropriate Butler repository. | |||
| Containers | |||
| ---------- | |||
|
|
|||
| Three containers are built from this repo: enqueue, ingest, and idle. | |||
| Four containers are built from this repo: enqueue, ingest, idle, and presence. | |||
| @@ -146,9 +146,12 @@ def __init__(self, path): | |||
| self.instrument = f"{csc}/{generator}" | |||
| elif len(components) == 6: | |||
| self.bucket, self.instrument, year, month, day, self.filename = components | |||
| elif len(components) == 5: # photodiode data | |||
There was a problem hiding this comment.
Hm. This really says that the Camera is not following salobj precedent in generating its LFA data. I guess it may be too late to get that changed.
| @@ -220,6 +234,13 @@ def main(): | |||
|
|
|||
| logger.info("Ingesting %s", resources) | |||
| refs = None | |||
| if is_lfa: | |||
| resources_photodiode = [ | |||
There was a problem hiding this comment.
The Internet says you could write this as:
resources_photodiode = []
resources = []
for resource in resources:
(resources_photodiode if re.search(r"MTCamera/photodiode.*_photodiode.ecsv$", resource) else resources).append(resource)
Even the fully explicit:
for resource in resources:
if re.search():
resources_photodiode.append(resource)
else:
resources.append(resource)
might be clearer.
| @@ -233,6 +254,22 @@ def main(): | |||
| info = Info.from_path(resource.geturl()) | |||
| r.lrem(worker_queue, 0, info.path) | |||
|
|
|||
| if is_lfa and resources_photodiode: | |||
There was a problem hiding this comment.
Since this is the same structure as the previous section, it might be nice to abstract that out into a function, in case we have more ingesters later.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I don't like so many special casing, but it might be necessary unless
RawIngestTaskis made to accept photodiode data?