From .
 * [new ref]                   HEAD       -> merge-attempt
From https://github.com/cms-sw/cmssw
 * [new ref]                   refs/pull/48097/head -> cms-sw/refs/pull/48097/head
Switched to branch 'merge-attempt'
Merge made by the 'ort' strategy.
 .../Provenance/interface/ProductProvenanceLookup.h |  5 +-
 .../interface/IntrusiveMonitorBase.h               | 39 ++++++++++
 .../AbstractServices/src/IntrusiveMonitorBase.cc   |  5 ++
 .../HGCalCommonData/data/dd4hep/testHGCalV16.xml   | 52 ++++++++-----
 .../HGCalCommonData/data/dd4hep/testHGCalV17.xml   | 82 +++++++++++++------
 .../data/dd4hep/testHGCalV17Shift.xml              | 32 ++++----
 .../HGCalCommonData/data/dd4hep/testHGCalV17n.xml  | 32 ++++----
 .../HGCalCommonData/data/dd4hep/testHGCalV18.xml   | 30 +++----
 .../data/hgcalwafer/v19/hgcalpos.xml               | 89 ++++++++-------------
 .../HGCalCommonData/interface/HGCalDDDConstants.h  |  2 +
 .../HGCalCommonData/interface/HGCalWaferMask.h     |  4 +-
 .../plugins/DDHGCalWaferPartialRotated.cc          |  4 +-
 .../plugins/dd4hep/DDHGCalWaferPartialRotated.cc   |  2 +-
 Geometry/HGCalCommonData/src/HGCalDDDConstants.cc  | 34 +++++++-
 Geometry/HGCalCommonData/src/HGCalWaferMask.cc     | 50 +++++++-----
 IOPool/TFileAdaptor/src/TStorageFactoryFile.cc     | 13 ++++
 PerfTools/AllocMonitor/README.md                   | 33 ++++++++
 .../AllocMonitor/plugins/IntrusiveAllocMonitor.cc  | 91 ++++++++++++++++++++++
 PerfTools/AllocMonitor/test/BuildFile.xml          | 14 ++++
 .../test/test_intrusiveAllocMonitor.cc             | 46 +++++++++++
 20 files changed, 482 insertions(+), 177 deletions(-)
 create mode 100644 FWCore/AbstractServices/interface/IntrusiveMonitorBase.h
 create mode 100644 FWCore/AbstractServices/src/IntrusiveMonitorBase.cc
 create mode 100644 PerfTools/AllocMonitor/plugins/IntrusiveAllocMonitor.cc
 create mode 100644 PerfTools/AllocMonitor/test/test_intrusiveAllocMonitor.cc
Switched to branch 'from-CMSSW_15_1_X_2025-05-15-1100'