Skip to content

Merge remaining Muon Collider changes from fork#202

Merged
tmadlener merged 39 commits intoiLCSoft:masterfrom
MuonColliderSoft:master
Feb 10, 2025
Merged

Merge remaining Muon Collider changes from fork#202
tmadlener merged 39 commits intoiLCSoft:masterfrom
MuonColliderSoft:master

Conversation

@madbaron
Copy link
Contributor

@madbaron madbaron commented Feb 7, 2025

BEGINRELEASENOTES

  • Merge the remaining changes that were made to the muon collider fork
    • Make the anajob.py example python3 compatible (and remove python2 support) and install it as anajob.py executable if BUILD_ROOTDICT is enabled.

ENDRELEASENOTES

This PR includes all remaining differences implemented in the MuonColliderSoft fork of LCIO.
The idea would be to merge these upstream and discontinue/archive the fork.

bartosik-hep and others added 30 commits November 13, 2020 14:36
Changed the __iter__ method to follow the Python 3 convention
Python3 compatibility of Reader class
Merge with Ilcsoft version v02-19-01
adding number of holes to track class
Replaced anajob utility with a Python version
Changed the __iter__ method to follow the Python 3 convention
Co-authored-by: Thomas Madlener <thomas.madlener@desy.de>
Co-authored-by: Thomas Madlener <thomas.madlener@desy.de>
Copy link
Contributor

@tmadlener tmadlener left a comment

Choose a reason for hiding this comment

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

Merging this as soon as the CI passes

@tmadlener tmadlener enabled auto-merge (squash) February 10, 2025 15:58
@tmadlener tmadlener disabled auto-merge February 10, 2025 15:58
@tmadlener tmadlener changed the title Merge Muon Collider changes upstream Merge remaining Muon Collider changes from fork Feb 10, 2025
@tmadlener tmadlener enabled auto-merge (squash) February 10, 2025 15:59
@tmadlener tmadlener merged commit 00f72b7 into iLCSoft:master Feb 10, 2025
12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants