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

Update 4FGL catalog default to DR4 #4703

Merged
merged 6 commits into from Oct 4, 2023

Conversation

QRemy
Copy link
Contributor

@QRemy QRemy commented Jul 31, 2023

Update 4FGL catalog default to DR4 and load the correct extended sources file based on the catalog version.
Requires gammapy/gammapy-data#42

Copy link
Contributor

@registerrier registerrier left a comment

Choose a reason for hiding this comment

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

Thanks @QRemy . Is it possible to add tests using different versions of the release?

source_object_class = SourceCatalogObject4FGL

def __init__(self, filename="$GAMMAPY_DATA/catalogs/fermi/gll_psc_v28.fit.gz"):
def __init__(self, filename="$GAMMAPY_DATA/catalogs/fermi/gll_psc_v32.fit"):
Copy link
Contributor

Choose a reason for hiding this comment

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

How about gzipping the file here as well?

Copy link
Contributor Author

@QRemy QRemy Aug 4, 2023

Choose a reason for hiding this comment

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

done, also I updated the tests based on DR2&3 to DR4 so we can delete the catalog files from DR2 and DR3 from gammapy-data

Copy link
Member

Choose a reason for hiding this comment

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

So, the code should be updated after you change, no?

@codecov
Copy link

codecov bot commented Aug 4, 2023

Codecov Report

Merging #4703 (1109e5c) into main (60f03ad) will increase coverage by 0.07%.
Report is 103 commits behind head on main.
The diff coverage is 20.00%.

@@            Coverage Diff             @@
##             main    #4703      +/-   ##
==========================================
+ Coverage   75.95%   76.03%   +0.07%     
==========================================
  Files         223      223              
  Lines       31959    32136     +177     
==========================================
+ Hits        24275    24434     +159     
- Misses       7684     7702      +18     
Files Coverage Δ
gammapy/catalog/fermi.py 14.66% <20.00%> (-0.13%) ⬇️

... and 24 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Signed-off-by:  <quentin.remy@live.fr>
Signed-off-by:  <quentin.remy@live.fr>
Signed-off-by:  <quentin.remy@live.fr>
Signed-off-by:  <quentin.remy@live.fr>
Signed-off-by:  <quentin.remy@live.fr>
@QRemy QRemy added backport-v1.0.x on-merge: backport to v1.0.x backport-v1.1.x on-merge: backport to v1.1.x labels Aug 9, 2023
@bkhelifi bkhelifi added this to the 1.2 milestone Sep 15, 2023
bkhelifi
bkhelifi previously approved these changes Sep 15, 2023
Copy link
Member

@bkhelifi bkhelifi left a comment

Choose a reason for hiding this comment

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

Thanks a lot @QRemy

@registerrier
Copy link
Contributor

Regarding the backports: for former versions we use tagged versions of gammapy-data. The changes you introduced should therefore not appear in gammapy-data used by v1.0.x and v1.1.x.

@registerrier registerrier removed backport-v1.0.x on-merge: backport to v1.0.x backport-v1.1.x on-merge: backport to v1.1.x labels Oct 3, 2023
Copy link
Contributor

@registerrier registerrier left a comment

Choose a reason for hiding this comment

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

Thanks @QRemy. Looks good!

I have removed the backports here.

@registerrier registerrier merged commit cecb6f8 into gammapy:main Oct 4, 2023
14 of 15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
gammapy.catalog
  
Awaiting triage
Development

Successfully merging this pull request may close these issues.

None yet

3 participants