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

Magic MC support #5

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
fb13399
Magic events & MC info reading prototype
Oct 18, 2023
1278f6c
Magic "original" MC tree reader.
Oct 19, 2023
23cfdb6
High-level MAGIC MC file class.
Oct 19, 2023
6c201b3
MagicMcFile: string representation.
Oct 19, 2023
5367c6a
Bug fix: MagicMcInfo.num_showers is expected to be a quantity.
Oct 19, 2023
b213ab6
Missing import.
Oct 19, 2023
d85cc92
MAGIC to DL2 coverter.
Oct 19, 2023
e6ca653
MAGIC to DL2 converter: resolution notification.
Oct 19, 2023
2d3f6d6
Fixing the conversion to quantities, likely broken by tables / pandas
Oct 19, 2023
1639f72
MagicStereoEvents: added overlooked reconstructed position x/y.
Oct 19, 2023
890de42
MagicStereoEvents: fixing reco_src_x/y conversion.
Oct 19, 2023
85636bd
MagicStereoEvents: optional MC telescope coordinates.
Oct 19, 2023
2d3bcc4
MagicStereoEvents: adding new fields to the export data frame.
Oct 19, 2023
b0bab44
MagicStereoEvents: aligning the export units with expectation of the
Oct 19, 2023
57070ea
MagicStereoEvents: fixing MC energy export.
Oct 19, 2023
9e95e88
MagicStereoEvents: event_id as DAQ event number.
Oct 19, 2023
90d71fb
MagicMcInfo: reading run number.
Oct 19, 2023
a9b8e21
MagicMcInfo: using CTA naming style.
Oct 19, 2023
d01d1fc
MagicStereoEvents: adding obs_id.
Oct 19, 2023
9543721
Overlooked event_id.
Oct 19, 2023
49fd09b
Bug fix in run number reading (could not be cast to numpy with
Oct 19, 2023
9449122
Adding new fields to the files following the HEALPix split.
Oct 19, 2023
efff8e5
Effective focal length based on tel_id.
Oct 19, 2023
d20b2e5
Fixing the conversion to quantities, likely broken by tables / pandas
Oct 19, 2023
ca6b968
Added missing fields when splitting an MC file.
Oct 19, 2023
1704aba
MCSample: when computing event coordinates, using per-event telescope…
Oct 24, 2023
5f351cf
MagicStereoEvents: using expected MAGIC tel_id.
Oct 24, 2023
70d9e1b
MagicMcFile: special treatment for run_config, that appears to be too
Oct 24, 2023
db97ba5
MagicMcFile: overwriting obs_id with the correct value.
Oct 24, 2023
6a608a0
MagicMcFile: pretending camera to be that of LST (to enable loading with
Oct 24, 2023
9cb962a
Incrementing code version due to the added new functionality (MAGIC
Oct 24, 2023
9846c09
Relaxing package dependencies.
Oct 24, 2023
2874eb2
Revert "MCSample: when computing event coordinates, using per-event t…
Oct 24, 2023
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
11 changes: 6 additions & 5 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "srcsim"
version = "1.0.0"
version = "1.1.0"
authors = [
{ name="Ievgen Vovk", email="[email protected]" },
{ name="Marcel Strzys", email="[email protected]" },
Expand All @@ -20,12 +20,12 @@ classifiers = [
"Operating System :: OS Independent",
]
dependencies = [
"astropy==5.1",
"astropy>=5.1",
"numpy>=1.21.0",
"pandas==1.4.1",
"pandas>=1.4.1",
"scipy>=1.5.0",
"tables==3.7.0",
"PyYAML==5.3.1"
"tables>=3.7.0",
"PyYAML>=5.3.1"
]

[project.urls]
Expand All @@ -35,3 +35,4 @@ dependencies = [
[project.scripts]
getruns = "srcsim.scripts.get_runs:main"
simrun = "srcsim.scripts.sim_run:main"
magic_to_dl2 = "srcsim.scripts.magic_to_dl2:main"
3 changes: 3 additions & 0 deletions src/srcsim/magic/mc/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from .info import MagicMcInfo
from .events import MagicStereoEvents, MagicMcOrigEvents
from .file import MagicMcFile
Loading