Commit 7417a3ef authored by Yoshiki Ohtani's avatar Yoshiki Ohtani
Browse files

Merge branch 'master' of https://gitlab.mpcdf.mpg.de/ievo/ctapipe_io_magic into dev_yoshiki

Conflicts:
	ctapipe_io_magic/__init__.py
parents fbedd645 0d5ee8a2
Pipeline #92613 failed with stage
in 8 minutes and 48 seconds
......@@ -85,8 +85,14 @@ Monitoring data are saved in `run['data'].monitoring_data` and can also accessed
Dead pixel and pedestal information are read by `magic-cta-pipe` `MAGIC_Badpixels.py` class.
##### MC Header data
Some general information about the simulated data, useful for IRF calculation, are read from the root files and stored in data.mcheader container.
#### Changelog
- v0.1: Initial version
- v0.2.0: Unification of data and MC reading
- v0.2.1: Monitoring data (Dead pixel and pedestal information)
\ No newline at end of file
- v0.2.1: Monitoring data (Dead pixel and pedestal information)
- v0.2.2: Added MC Header info
- v0.2.3: Solve issue when interpolating information from drive reports, causing crashes when using pointing information in astropy SkyCoord objects. Make the reader faster when searching for ids of mono and stereo events
- v0.2.4: fixes in mono_event_generator; fix to allow the use of relative paths as `input_url`
\ No newline at end of file
This diff is collapsed.
......@@ -48,7 +48,7 @@ def test_that_event_is_not_modified_after_loop():
# Unfortunately this does not work:
# assert last_event == event
# So for the moment we just compare event ids
assert event.r0.event_id == last_event.r0.event_id
assert event.index.event_id == last_event.index.event_id
def test_len():
......@@ -87,11 +87,11 @@ def test_eventseeker():
seeker = EventSeeker(source)
event = seeker[0]
assert event.count == 0
assert event.dl0.event_id == 29795
assert event.index.event_id == 29795
event = seeker[2]
assert event.count == 2
assert event.r1.event_id == 29798
assert event.index.event_id == 29798
def test_eventcontent():
dataset = get_dataset_path("20131004_M1_05029747.003_Y_MagicCrab-W0.40+035.root")
......@@ -102,5 +102,5 @@ def test_eventcontent():
event = seeker[0]
assert event.dl1.tel[1].image[0] == -0.53125
assert event.dl1.tel[2].image[0] == 2.2265625
assert event.dl1.tel[1].pulse_time[0] == 49.125
assert event.dl1.tel[2].pulse_time[0] == 23.5625
assert event.dl1.tel[1].peak_time[0] == 49.125
assert event.dl1.tel[2].peak_time[0] == 23.5625
......@@ -10,20 +10,20 @@ with open(path.join(this_directory, 'README.md'), encoding='utf-8') as f:
setup(
name='ctapipe_io_magic',
packages=find_packages(),
version='0.2.1',
version='0.2.4',
description='ctapipe plugin for reading of the calibrated MAGIC files',
long_description=long_description,
long_description_content_type='text/markdown',
install_requires=[
'ctapipe',
'astropy',
'uproot',
'uproot3',
'numpy',
'scipy'
],
tests_require=['pytest'],
setup_requires=['pytest_runner'],
author='Ievgen Vovk',
author='Ievgen Vovk et al.',
author_email='Ievgen.Vovk@mpp.mpg.de',
license='MIT',
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment