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.

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

Collate 1d updates #1649

Merged
merged 6 commits into from
Aug 15, 2023
Merged

Collate 1d updates #1649

merged 6 commits into from
Aug 15, 2023

Conversation

badpandabear
Copy link
Collaborator

Updates to pypeit_collate_1d for ADAP 2019. Changes include:

  • Rejecting a SpecObj if it is entirely masked out
  • Default collate 1d to not checking the datamodel version when loading files.
  • Adding a chk_version flag to force checking the datamodel version if desired.

@codecov-commenter
Copy link

codecov-commenter commented Aug 10, 2023

Codecov Report

Merging #1649 (894dd41) into develop (ecbd212) will increase coverage by 0.00%.
Report is 4 commits behind head on develop.
The diff coverage is 65.00%.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

@@           Coverage Diff            @@
##           develop    #1649   +/-   ##
========================================
  Coverage    40.98%   40.99%           
========================================
  Files          189      189           
  Lines        43055    43092   +37     
========================================
+ Hits         17646    17664   +18     
- Misses       25409    25428   +19     
Files Changed Coverage Δ
pypeit/scripts/collate_1d.py 54.12% <57.14%> (-0.68%) ⬇️
pypeit/core/collate.py 95.71% <100.00%> (-0.07%) ⬇️
pypeit/fluxcalibrate.py 100.00% <100.00%> (ø)
pypeit/par/pypeitpar.py 96.06% <100.00%> (+<0.01%) ⬆️

... and 1 file with indirect coverage changes

Copy link
Collaborator

@profxj profxj left a comment

Choose a reason for hiding this comment

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

Looks good; one minor edit from me.

"""Build a list of SourceObjects from a list of spec1d files. There will be one SourceObject per
SpecObj in the resulting list (i.e. no combining or collating is done by this method).

Args:
spec1d_files (list of str): List of spec1d filenames
spec1d_files (list of :obj:`pypeit.specobjs.SpecObjs`): List of SpecObjs objects to build from.
Copy link
Collaborator

Choose a reason for hiding this comment

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

specobjs_list ?

Copy link
Collaborator

@debora-pe debora-pe left a comment

Choose a reason for hiding this comment

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

Looks good. Thank you @badpandabear!

- **missing_archive_msgs** (:obj:`list`): A list of messages
explaining why some source objects were excluded.

**excluded_messages** (:obj:`list`): A list of messages explaining why some source objects were excluded.
Copy link
Collaborator

Choose a reason for hiding this comment

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

I think here it's missing the - for the bullet list

@badpandabear
Copy link
Collaborator Author

dev-suite run:

Test Summary
--------------------------------------------------------
--- PYTEST PYPEIT UNIT TESTS PASSED  232 passed, 73 warnings in 370.06s (0:06:10) ---
--- PYTEST UNIT TESTS FAILED  5 failed, 118 passed, 191 warnings in 808.21s (0:13:28) ---
--- PYTEST VET TESTS PASSED  47 passed, 29 warnings in 636.68s (0:10:36) ---
--- PYPEIT DEVELOPMENT SUITE PASSED 207/207 TESTS  ---
Testing Started at 2023-08-10T02:58:47.575034
Testing Completed at 2023-08-10T10:54:18.445617
Total Time: 7:55:30.870583

The failed unit tests were later fixed by
pypeit/PypeIt-development-suite#272

@badpandabear badpandabear merged commit 2c8fcaa into develop Aug 15, 2023
25 checks passed
@badpandabear badpandabear deleted the collate_updates branch August 15, 2023 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants