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

Use eventio v0.17.1 #966

Merged
merged 8 commits into from
Feb 26, 2019
Merged

Use eventio v0.17.1 #966

merged 8 commits into from
Feb 26, 2019

Conversation

dneise
Copy link
Member

@dneise dneise commented Feb 12, 2019 •
edited by maxnoe
Loading

  • Can read more kinds of simtel files (e.g. where multiple runs got merged)
  • Can read calibration events

@dneise dneise mentioned this pull request Feb 12, 2019
Closed
@maxnoe
Copy link
Member

maxnoe commented Feb 19, 2019

This needs the not yet released version 0.17.0 of pyeventio and 0.2.17 of ctapipe-extra with the calibration events test file.

@maxnoe
Copy link
Member

maxnoe commented Feb 20, 2019

eventio 0.17.0 is now released, waiting for a new release of ctapipe-extra

@dneise
Copy link
Member Author

dneise commented Feb 21, 2019

ctapipe/io/tests/test_simteleventsource.py::test_calibration_events fails ...

@codecov
Copy link

codecov bot commented Feb 21, 2019 •
edited
Loading

Codecov Report

Merging #966 into master will increase coverage by 0.13%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #966      +/-   ##
==========================================
+ Coverage   77.74%   77.88%   +0.13%     
==========================================
  Files         191      189       -2     
  Lines       10831    10816      -15     
==========================================
+ Hits         8421     8424       +3     
+ Misses       2410     2392      -18
Impacted Files Coverage Δ
ctapipe/io/tests/test_simteleventsource.py 100% <100%> (ø) ⬆️
ctapipe/io/simteleventsource.py 100% <100%> (ø) ⬆️
ctapipe/io/containers.py 100% <100%> (ø) ⬆️
ctapipe/coordinates/nominal_frame.py 88% <0%> (-0.47%) ⬇️
ctapipe/instrument/camera.py 92.89% <0%> (-0.28%) ⬇️
ctapipe/coordinates/camera_frame.py 90.9% <0%> (-0.21%) ⬇️
ctapipe/visualization/mpl_array.py 96.07% <0%> (-0.08%) ⬇️
ctapipe/reco/tests/test_HillasReconstructor.py 94.66% <0%> (-0.08%) ⬇️
ctapipe/image/muon/muon_diagnostic_plots.py 0% <0%> (ø) ⬆️
ctapipe/coordinates/telescope_frame.py 100% <0%> (ø) ⬆️
... and 11 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 79ad0e0...53b756c. Read the comment docs.

@maxnoe maxnoe changed the title start using eventio v0.17.0 Use eventio v0.17.1 Feb 21, 2019
maxnoe
maxnoe previously approved these changes Feb 21, 2019
View reviewed changes
@dneise
Copy link
Member Author

dneise commented Feb 21, 2019

Nice !

kbruegge
kbruegge reviewed Feb 22, 2019
View reviewed changes
setup.py Outdated
@@ -65,7 +65,7 @@
'pandas',
'bokeh>=1.0.1',
'scikit-learn',
'eventio==0.11.0',
'eventio==0.17.0',
Copy link
Member

Choose a reason for hiding this comment

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

should this be 0.17.1?

kbruegge
kbruegge reviewed Feb 22, 2019
View reviewed changes
ctapipe/io/containers.py
@@ -428,6 +428,7 @@ class TelescopePointingContainer(Container):
class DataContainer(Container):
""" Top-level container for all event information """

event_type = Field('data', "Event type")
Copy link
Member

Choose a reason for hiding this comment

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

what are the options here? Is it data vs calibration event? Or is it observed vs simulated event?

Copy link
Member Author

Choose a reason for hiding this comment

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

Ah that's indeed a good question, maybe this PR makes sense in this context.
#978

By defining an enum.Enum or enum.IntEnum the choices are somehow obvious...

Copy link
Member

Choose a reason for hiding this comment

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

For now, data and calibration can come from eventio. But I was not really pleased with that choice. Physics and specific calibration names would be better I think. I will change that in eventio once we agree on the names.

@maxnoe
Copy link
Member

maxnoe commented Feb 25, 2019

Setup.py is fixed, @cta-observatory/ctapipe-core-devs please review again

@dneise
Copy link
Member Author

dneise commented Feb 25, 2019

@maxnoe this PR was opened by me, so you could review already .. :-D

@maxnoe
Copy link
Member

maxnoe commented Feb 25, 2019

Ah, right.

@maxnoe maxnoe merged commit 3c17dcb into master Feb 26, 2019
@maxnoe maxnoe deleted the eventio_17.0 branch February 26, 2019 09:27
@maxnoe maxnoe mentioned this pull request May 8, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@maxnoe maxnoe maxnoe approved these changes

@kbruegge kbruegge kbruegge approved these changes

@kosack kosack Awaiting requested review from kosack

@thomasgas thomasgas Awaiting requested review from thomasgas

@vuillaut vuillaut Awaiting requested review from vuillaut

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dneise @maxnoe @kbruegge