From b18c531b3361a9de4af1cc19c7063000a8c59c32 Mon Sep 17 00:00:00 2001 From: Mark Smith Date: Mon, 19 Oct 2026 16:42:35 +0100 Subject: [PATCH] Revert "feat: add aegir event id to event header" This reverts commit 84b841e01dd66e9017210c8f944e63922c8c548f. --- include/SHiP/EventHeader.hpp | 12 ++++++------ include/SHiP/LinkDef.h | 2 +- tests/data/reference_head.root | Bin 6253 -> 6171 bytes tests/data/schema_snapshot.txt | 6 ++---- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/include/SHiP/EventHeader.hpp b/include/SHiP/EventHeader.hpp index d0aacf7..5f9f38d 100644 --- a/include/SHiP/EventHeader.hpp +++ b/include/SHiP/EventHeader.hpp @@ -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; }; diff --git a/include/SHiP/LinkDef.h b/include/SHiP/LinkDef.h index 0a70e60..8ef88fa 100644 --- a/include/SHiP/LinkDef.h +++ b/include/SHiP/LinkDef.h @@ -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+; diff --git a/tests/data/reference_head.root b/tests/data/reference_head.root index de9e6cba420c028eee3bfa1118c88f4e42b22b64..33a77b8204304de6630a62fd60f88f61845c3ddd 100644 GIT binary patch delta 3312 zcmaKtc{tSH7so$_!I&?Np^WTH8X{xgV#XTDHprfmHOe-Tb&`F}7>1-FyM!#IZ$oyz zB0otbOALjQHG7QT(C_<4|NQRroclh{z2}^JpXc7^brw+%P%;6&zBmBb1pxry3IGT` z0O0vV_jTyTKsPKCU3UNgP7eaR5#*E!7$#^M;}80lMP#zX7$M;NdAc0B^d))_fTbI~ z(&2#9b0MWKolqAI5ib{?_60F@yZqkycV@bJSV|!FFh7Gq2!ECdh!p^k&t&(n#PXjK z0ZtU&HJ%z&W$`R9TTQuM@KDU&6q& zma4WyQ?M!uT61ZVWq$H^tG&$7gz;!|V^6Fph zsA7m@3>A^ay2=zaPpnJbc&J{p;Fxf;{El|Mo^wa~Vv$|_ocHjA*>%;M+IO3$`%4!B zSyfH%dE!+?%)1I*u@&20gp0*KJshu5!Vkn!(kjCK^a^M4#ovvX|QOf2xw{qH1!bb#m0x8J2a1UnTBTL zWqNs+F7|!YIMad;cGvu2N_pEQ*Q=Ts7S2!}(WUPspUXhvk`ao!r-8$K z7LDF#2)$MdwKZfcOX5(*rfUNcst&AK{Mz32HlPjJxu( zQsf*hF3`uDExF(t3w1si+7awc|TF z9LaUenl%eTOIbF3k$PwIz+L|;U!+Om&1A3Se5eMnjyFDWWB))SJ!9ot6dVvF)s$t) zyCt?k3&vWhO)mG_DCb-vygSA!%qjcn6=rSY8wZMwr3Y1VzpXJnP!Eh{h##f#_YeRGh^4%08Vim?+e_3~yJ6osUeo?BVM z7S=o}tN-%t8JV9aRC{b5y~Ls7I-EcEw^(B2_deHrtEug9vk_yhGhS>}xDA0S;+FsF zn+Lsv_bC!GAmbVA(JCS9j2*V9IM6fQ;vey|EJRt;UlNEoYB2?WJ``-9sLP2I z`;<6Z=&N*GOm+RB^RP#u08l10obE*(tI1ZrY`CIGBc^fk@x&d~Fg>cF`tNVx3?;U5 z3VLD=TO8+-%B1pJ1!8|I=jq=HSpH874i!T;!!ck@_$+LI?&6LPJNM^d zaDaFYe(L{SGTr0g@69%;;GU4&%@&_nFEP8t-X)w$P4n2@xZu%QLLE6f&9nIVvZHV$?-iU(*yo# zt^2yG{A7HZhsyaDJ7?dOTR0pJ&(!&|=1U%nAB1%e`Yd9y)4jJHS*(`rzm?ttgEwu0moCBtT$hcBd9;B0ar+SiO4 zot}+w&B2+twChD`zwe8^qM9tLtP-UmL5`Rr_N{xWPsm)nN-ssenn5Rn-0b~Y8HDxb zSuWA6`|ZYV<%<_^DQ@BKb-cP1-R%(W@ESf4=axmwmk1@5u;f?*kAF7(1li@$rj1q1 z*|;udE?JJjc0^jW_OKExA2WF-E^X}(PM*KteN3$kObJ*GbjYc%&ZX zU{r+n!37ulOO(YoiH{(Y#WU7bKfL_~msRGY5?{`8A+k6S(cP&Wh|ru9f4RiWP6|VB z5V!i$pL?6CWm(7JjrmF78O!&5_ox@ZZwp6AC!(O`ZLV%{dU~$nMj1FNI7V2M(=G&# zdE_Ns2y@{TMa95$67C>$^h7xcge#q;Ml7mObv0QVk2Nj94-nW~HK<3(>hG?PRDRnkL;&G&vx*SB}u99A~Sb!YEa%(j{H@7 zs>jmZl7#ngg}O#0OW$_HQZe6nS=1Dl;^=$vbtu_&?!&ag_-O4U2y?B8EME(^n)SBm zw7geYI@N%mnn^XlamTw@k(;)93s;~Izd7y2-_8AXA0MmE6Z+Aqb#5S3M(N>S4>)3u zzeo5KpYFwX*L@GokGHwU>j>@}AnD|WFeK@%_;9mySrvV`J*zKSqhAQrWkr4!PVl`t2gH{`Sj@)GbXZYC3+_^OLG69DU)+()QcgHb2Y z-dd6dg#@(=5J~t5a%NDEQ^)2wofyTjd|pWQq4)AFgks8j_AwwCw+N7(djD$ Np*IEuU$9ap@Lw87s8Ij_ delta 3421 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 diff --git a/tests/data/schema_snapshot.txt b/tests/data/schema_snapshot.txt index a2b9b13..eee52c8 100644 --- a/tests/data/schema_snapshot.txt +++ b/tests/data/schema_snapshot.txt @@ -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 vertex @@ -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 (typever=0)