[EVO] fix merge conflicts 2026/04/30#50838

Merged

cmsbuild merged 70 commits into

cms-sw:CMSSW_17_0_EVOLUTION_Xfrom

Dr15Jones:evo_merge_2026_04_30

Apr 30, 2026

Commits on Nov 14, 2025

fixed error causing compile issues
brandiskip
committed

Commits on Jan 6, 2026

Commits on Jan 21, 2026

Commits on Jan 26, 2026

Commits on Feb 5, 2026

Including EXOnanoAODv1 custom constent
Lovisa
committed

Commits on Feb 19, 2026

Update PhysicsTools/NanoAOD/python/custom_displacedtau_cff.py

kerstinlovisa
and
makortel
authored

Commits on Feb 20, 2026

code-format correction
Lovisa
committed

Commits on Mar 9, 2026

Merged work_branch from repository brandiskip with cms-merge-topic
brandiskip
committed

Commits on Mar 12, 2026

Corrected for additional PR comments
Lovisa
committed
code format
Lovisa
committed

Commits on Mar 20, 2026

Commits on Mar 25, 2026

Commits on Apr 7, 2026

Commits on Apr 8, 2026

Commits on Apr 13, 2026

Commits on Apr 20, 2026

Commits on Apr 23, 2026

Remove TensorFlow dependency from BuildFile.xml
jfernan2
authored

Commits on Apr 24, 2026

Commits on Apr 25, 2026

fix code format with scram b code-format
francesco-vaselli
committed

Commits on Apr 27, 2026

Revert "Add ioread statements for PSimHit backward compatibility in classes_def.xml"
fabiocos
committed

Commits on Apr 29, 2026