Skip to content

Revert "feat: add aegir event id to event header" #54

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

Merged
olantwin merged 1 commit into from
Oct 29, 2026
Merged

Revert "feat: add aegir event id to event header" #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions include/SHiP/EventHeader.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ namespace SHiP {
struct EventHeader {
double weight{1.0}; ///< Event weight (e.g. P_DIS / nReplicas)
std::int64_t original_event_id{
-1}; ///< Originating event id, e.g. the muon
///< event that seeded this replica
///< (-1 = none). Event-level provenance,
///< distinct from MCParticle::mother_id,
///< which links particles within an event.
std::int64_t aegir_event_id{-1}; // What is the ID of this event from aegir
-1}; ///< Originating event id, e.g. the muon
///< event that seeded this replica
///< (-1 = none). Event-level provenance,
///< distinct from MCParticle::mother_id,
///< which links particles within an event.

bool operator==(EventHeader const&) const = default;
};

Expand Down
2 changes: 1 addition & 1 deletion include/SHiP/LinkDef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
#pragma link off all functions;

// Event metadata
#pragma link C++ options=version(3) class SHiP::EventHeader+;
#pragma link C++ options=version(2) class SHiP::EventHeader+;

// MC / generation
#pragma link C++ options=version(4) class SHiP::MCParticle+;
Expand Down
Binary file modified tests/data/reference_head.root
View file
Open in desktop
Binary file not shown.
6 changes: 2 additions & 4 deletions tests/data/schema_snapshot.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# TClass layout (version, checksum, data members)
class SHiP::EventHeader version=3 checksum=0xa95503fd
class SHiP::EventHeader version=2 checksum=0xd65dd49a
double weight
long original_event_id
long aegir_event_id
class SHiP::MCParticle version=4 checksum=0x8d1ef3c
int pdg_code
array<double,3> vertex
Expand Down Expand Up @@ -83,10 +82,9 @@ class SHiP::RecParticle version=3 checksum=0xc908f3a0
int creator_process
double ip_pv
# RNTuple field tree (one top-level field per dictionary class)
SHiP__EventHeader : SHiP::EventHeader (typever=3, checksum=0xa95503fd)
SHiP__EventHeader : SHiP::EventHeader (typever=2, checksum=0xd65dd49a)
weight : double (typever=0)
original_event_id : std::int64_t (typever=0)
aegir_event_id : std::int64_t (typever=0)
SHiP__MCParticle : SHiP::MCParticle (typever=4, checksum=0x8d1ef3c)
pdg_code : std::int32_t (typever=0)
vertex : std::array<double,3> (typever=0)
Expand Down
Loading