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

Track calibration frames by output product instead of input frames #389

Merged
merged 2 commits into from
Apr 23, 2024
Merged

Track calibration frames by output product instead of input frames #389

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
ba26ce1
Calibration frames are now associated with output data products rathe…
cmccully Apr 15, 2024
e25de49
Fix to unit test frame id save.
cmccully Apr 23, 2024
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
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
1.16.0 (2023-04-18)
-------------------
- Calibration frames are now associated with output data products rather than frames
so that we have more than one calibration data product produced per frame.

1.15.2 (2023-04-12)
-------------------
- Fix to fpacking data when the image data array is None
Expand Down
4 changes: 2 additions & 2 deletions banzai/lco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ def write(self, runtime_context):
if runtime_context.post_to_archive:
archived_image_info = file_utils.post_to_ingester(data_product.file_buffer, self,
data_product.filename, meta=data_product.meta)
self.frame_id = archived_image_info.get('frameid')
data_product.frame_id = archived_image_info.get('frameid')

if not runtime_context.no_file_cache:
os.makedirs(self.get_output_directory(runtime_context), exist_ok=True)
Expand Down Expand Up @@ -170,7 +170,7 @@ def to_db_record(self, output_product):
'instrument_id': self.instrument.id,
'is_master': self.is_master,
'is_bad': self.is_bad,
'frameid': self.frame_id,
'frameid': output_product.frame_id,
'attributes': {}}
for attribute in self.grouping_criteria:
record_attributes['attributes'][attribute] = str(getattr(self, attribute))
Expand Down
3 changes: 1 addition & 2 deletions banzai/tests/test_frames.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,8 @@ def test_frame_to_db_record():
'CONFMODE': 'full_frame'}, name='SCI')]
test_frame = LCOCalibrationFrame(hdu_list=hdu_list, file_path='/foo/bar')
test_frame.is_bad = False
test_frame.frame_id = 1234
test_frame.instrument = MagicMock(id=7)
mock_data_product = MagicMock(filename='test.fits.fz', filepath='/path/to/test/test.fits.fz')
mock_data_product = MagicMock(filename='test.fits.fz', filepath='/path/to/test/test.fits.fz', frame_id=1234)
db_record = test_frame.to_db_record(mock_data_product)

assert type(db_record) == CalibrationImage
Expand Down
Loading