From . * [new ref] HEAD -> merge-attempt From https://github.com/cms-sw/cmssw * [new ref] refs/pull/47719/head -> cms-sw/refs/pull/47719/head Switched to branch 'merge-attempt' Merge made by the 'ort' strategy. Alignment/CommonAlignment/BuildFile.xml | 1 + Alignment/CommonAlignment/src/AlignableModifier.cc | 2 +- Alignment/LaserAlignmentSimulation/BuildFile.xml | 1 + Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc | 2 +- Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc | 2 +- Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc | 2 +- CalibMuon/DTCalibration/test/BuildFile.xml | 1 + CalibMuon/DTCalibration/test/DBTools/FakeTTrig.cc | 2 +- CalibPPS/AlignmentRelative/plugins/BuildFile.xml | 1 + CalibPPS/AlignmentRelative/plugins/PPSFastLocalSimulation.cc | 2 +- CalibTracker/SiPhase2TrackerESProducers/plugins/BuildFile.xml | 1 + .../plugins/SiPhase2BadStripConfigurableFakeESSource.cc | 2 +- CondTools/RPC/BuildFile.xml | 1 + CondTools/RPC/src/RPCDBPerformanceHandler.cc | 2 +- CondTools/SiPhase2Tracker/plugins/BuildFile.xml | 1 + .../SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc | 2 +- EgammaAnalysis/ElectronTools/BuildFile.xml | 1 + EgammaAnalysis/ElectronTools/src/ElectronEnergyCalibrator.cc | 2 +- .../ElectronTools/src/ElectronEnergyCalibratorRun2.cc | 2 +- EgammaAnalysis/ElectronTools/src/PhotonEnergyCalibratorRun2.cc | 2 +- .../interface/RandomNumberGenerator.h | 10 ++++++---- FWCore/AbstractServices/src/RandomNumberGenerator.cc | 3 +++ FWCore/Framework/src/EventProcessor.cc | 2 +- FWCore/Framework/src/Schedule.cc | 2 +- FWCore/Integration/plugins/BuildFile.xml | 3 +++ FWCore/Integration/plugins/RandomIntProducer.cc | 3 ++- FWCore/Integration/plugins/TestInterProcessRandomProd.cc | 2 +- .../plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc | 2 +- FWCore/ServiceRegistry/BuildFile.xml | 1 + FWCore/ServiceRegistry/interface/RandomEngineSentry.h | 2 +- .../Services/interface/ExternalRandomNumberGeneratorService.h | 2 +- FWCore/Utilities/src/RandomNumberGenerator.cc | 4 ---- FastSimulation/CTPPSRecHitProducer/plugins/BuildFile.xml | 1 + .../CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc | 2 +- FastSimulation/TrackingRecHitProducer/BuildFile.xml | 1 + .../TrackingRecHitProducer/src/TrackingRecHitAlgorithm.cc | 2 +- FastSimulation/Utilities/BuildFile.xml | 1 + FastSimulation/Utilities/src/RandomEngineAndDistribution.cc | 2 +- GeneratorInterface/Core/plugins/BuildFile.xml | 1 + GeneratorInterface/Core/plugins/ExternalGeneratorFilter.cc | 2 +- GeneratorInterface/EvtGenInterface/plugins/BuildFile.xml | 1 + .../EvtGenInterface/plugins/EvtGen/EvtGenInterface.h | 2 +- GeneratorInterface/GenFilters/plugins/BuildFile.xml | 1 + GeneratorInterface/GenFilters/plugins/MinimumBiasFilter.cc | 2 +- .../HiGenCommon/plugins/BetaBoostEvtVtxGenerator.cc | 2 +- GeneratorInterface/HiGenCommon/plugins/BuildFile.xml | 1 + .../HiGenCommon/plugins/HiCentralityBiasFilter.cc | 2 +- GeneratorInterface/LHEInterface/plugins/BuildFile.xml | 1 + GeneratorInterface/LHEInterface/plugins/ExternalLHEProducer.cc | 2 +- GeneratorInterface/Pythia8Interface/plugins/BuildFile.xml | 2 ++ .../Pythia8Interface/plugins/Pythia8Hadronizer.cc | 2 +- .../Pythia8Interface/plugins/Pythia8HepMC3Hadronizer.cc | 2 +- GeneratorInterface/TauolaInterface/BuildFile.xml | 1 + GeneratorInterface/TauolaInterface/interface/TauSpinnerCMS.h | 4 +--- GeneratorInterface/TauolaInterface/plugins/BuildFile.xml | 2 ++ .../TauolaInterface/plugins/TauSpinner/TauSpinnerCMS.cc | 2 +- .../TauolaInterface/plugins/TauSpinner/TauSpinnerFilter.cc | 4 ++-- .../TauolaInterface/plugins/Tauolapp/TauolappInterface.cc | 2 +- IOMC/EventVertexGenerators/BuildFile.xml | 1 + IOMC/EventVertexGenerators/src/BaseEvtVtxGenerator.cc | 2 +- IOMC/EventVertexGenerators/src/BeamDivergenceVtxGenerator.cc | 2 +- IOMC/EventVertexGenerators/src/GaussianZBeamSpotFilter.cc | 2 +- IOMC/EventVertexGenerators/src/PassThroughEvtVtxGenerator.cc | 2 +- IOMC/ParticleGuns/BuildFile.xml | 1 + IOMC/ParticleGuns/src/BaseFlatGunProducer.cc | 2 +- IOMC/ParticleGuns/src/BaseRandomtXiGunProducer.cc | 2 +- IOMC/ParticleGuns/src/BeamMomentumGunProducer.cc | 2 +- IOMC/ParticleGuns/src/CloseByParticleGunProducer.cc | 2 +- IOMC/ParticleGuns/src/ExpoRandomPGunProducer.cc | 2 +- IOMC/ParticleGuns/src/ExpoRandomPtGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FileRandomKEThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FileRandomMultiParticlePGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatBaseThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomEGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomEThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomMultiParticlePGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomOneOverPtGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomPtAndDxyGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomPtGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomPtThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/GaussRandomPThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/MultiParticleInConeGunProducer.cc | 2 +- IOMC/ParticleGuns/src/RandomMultiParticlePGunProducer.cc | 2 +- IOMC/ParticleGuns/src/RandomXiThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/RandomtXiGunProducer.cc | 2 +- IOMC/RandomEngine/plugins/BuildFile.xml | 1 + IOMC/RandomEngine/plugins/RandomEngineStateProducer.cc | 2 +- IOMC/RandomEngine/plugins/RandomFilter.cc | 2 +- IOMC/RandomEngine/plugins/RandomNumberGeneratorService.h | 2 +- IOMC/RandomEngine/test/BuildFile.xml | 1 + IOMC/RandomEngine/test/TestRandomNumberServiceGlobal.cc | 2 +- IOPool/SecondaryInput/test/BuildFile.xml | 1 + IOPool/SecondaryInput/test/SecondaryProducer.cc | 2 +- L1Trigger/HardwareValidation/plugins/BuildFile.xml | 1 + L1Trigger/HardwareValidation/plugins/L1DummyProducer.cc | 2 +- L1Trigger/HardwareValidation/plugins/L1EmulBias.cc | 2 +- L1Trigger/TrackFindingTMTT/BuildFile.xml | 1 + L1Trigger/TrackFindingTMTT/interface/StubKiller.h | 2 +- Mixing/Base/BuildFile.xml | 1 + Mixing/Base/src/PileUp.cc | 2 +- Mixing/Base/src/PileupRandomNumberGenerator.h | 2 +- RecoEgamma/EgammaTools/BuildFile.xml | 1 + RecoEgamma/EgammaTools/src/ElectronEnergyCalibrator.cc | 2 +- RecoEgamma/EgammaTools/src/PhotonEnergyCalibrator.cc | 2 +- RecoJets/FFTJetProducers/plugins/BuildFile.xml | 1 + RecoJets/FFTJetProducers/plugins/FFTJetVertexAdder.cc | 2 +- RecoJets/JetAlgorithms/BuildFile.xml | 1 + RecoJets/JetAlgorithms/interface/Qjets.h | 2 +- RecoJets/JetProducers/plugins/BuildFile.xml | 1 + RecoJets/JetProducers/plugins/HTTTopJetProducer.h | 2 +- SimCalorimetry/CastorSim/plugins/BuildFile.xml | 1 + SimCalorimetry/CastorSim/plugins/CastorDigiProducer.cc | 2 +- SimCalorimetry/EcalSimAlgos/BuildFile.xml | 1 + SimCalorimetry/EcalSimAlgos/src/ESElectronicsSim.cc | 2 +- SimCalorimetry/EcalSimAlgos/src/EcalTimeMapDigitizer.cc | 4 ---- SimCalorimetry/EcalSimProducers/BuildFile.xml | 1 + SimCalorimetry/EcalSimProducers/src/EcalDigiProducer.cc | 3 +-- SimCalorimetry/EcalSimProducers/src/EcalDigiProducer_Ph2.cc | 2 +- SimCalorimetry/HGCalSimProducers/plugins/BuildFile.xml | 1 + SimCalorimetry/HGCalSimProducers/plugins/HGCDigiProducer.cc | 2 +- SimCalorimetry/HGCalSimProducers/plugins/HGCDigitizer.cc | 2 +- .../HGCalSimProducers/plugins/PreMixingHGCalWorker.cc | 2 +- SimCalorimetry/HcalSimAlgos/test/BuildFile.xml | 3 ++- SimCalorimetry/HcalSimAlgos/test/SiPMNonlinearityAnalyzer.cc | 2 +- SimCalorimetry/HcalSimProducers/BuildFile.xml | 1 + SimCalorimetry/HcalSimProducers/src/HcalDigiProducer.cc | 2 +- SimCalorimetry/HcalTestBeam/BuildFile.xml | 1 + SimCalorimetry/HcalTestBeam/src/HcalTBDigiProducer.cc | 2 +- SimFastTiming/FastTimingCommon/plugins/BuildFile.xml | 1 + SimFastTiming/FastTimingCommon/plugins/MTDDigiProducer.cc | 2 +- SimFastTiming/FastTimingCommon/plugins/PreMixingMTDWorker.cc | 2 +- SimG4CMS/EcalTestBeam/plugins/BuildFile.xml | 1 + SimG4CMS/EcalTestBeam/plugins/EcalTBMCInfoProducer.cc | 2 +- SimG4CMS/Forward/BuildFile.xml | 1 + SimG4CMS/Forward/src/ZdcShowerLibrary.cc | 2 +- SimG4Core/Application/plugins/BuildFile.xml | 1 + SimG4Core/Application/plugins/OscarMTProducer.cc | 2 +- SimGeneral/DataMixingModule/plugins/BuildFile.xml | 1 + .../DataMixingModule/plugins/DataMixingHcalDigiWorkerProd.cc | 2 +- SimGeneral/NoiseGenerators/test/BuildFile.xml | 1 + .../NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc | 2 +- SimGeneral/PreMixingModule/plugins/BuildFile.xml | 1 + SimGeneral/PreMixingModule/plugins/PreMixingModule.cc | 2 +- SimMuon/CSCDigitizer/BuildFile.xml | 1 + SimMuon/CSCDigitizer/plugins/BuildFile.xml | 1 + SimMuon/CSCDigitizer/plugins/CSCChamberMasker.cc | 2 +- SimMuon/CSCDigitizer/src/CSCDigiProducer.cc | 2 +- SimMuon/CSCDigitizer/test/CSCNoiseMatrixTest.cc | 2 +- SimMuon/DTDigitizer/BuildFile.xml | 1 + SimMuon/DTDigitizer/plugins/BuildFile.xml | 1 + SimMuon/DTDigitizer/plugins/DTChamberMasker.cc | 2 +- SimMuon/DTDigitizer/src/DTDigitizer.cc | 2 +- SimMuon/GEMDigitizer/plugins/BuildFile.xml | 1 + SimMuon/GEMDigitizer/plugins/GEMDigiProducer.cc | 2 +- SimMuon/GEMDigitizer/plugins/ME0DigiPreRecoProducer.cc | 2 +- SimMuon/GEMDigitizer/plugins/ME0DigiProducer.cc | 2 +- SimMuon/GEMDigitizer/plugins/ME0ReDigiProducer.cc | 2 +- SimMuon/Neutron/BuildFile.xml | 1 + SimMuon/Neutron/src/SubsystemNeutronWriter.cc | 2 +- SimMuon/RPCDigitizer/BuildFile.xml | 1 + SimMuon/RPCDigitizer/plugins/BuildFile.xml | 1 + SimMuon/RPCDigitizer/plugins/RPCChamberMasker.cc | 2 +- SimMuon/RPCDigitizer/src/RPCDigiProducer.cc | 2 +- SimMuon/RPCDigitizer/src/RPCSimSetUp.cc | 2 +- SimMuon/RPCDigitizer/src/RPCandIRPCDigiProducer.cc | 2 +- SimPPS/DirectSimProducer/plugins/BuildFile.xml | 1 + SimPPS/DirectSimProducer/plugins/PPSDirectProtonSimulation.cc | 2 +- SimPPS/PPSPixelDigiProducer/plugins/BuildFile.xml | 1 + SimPPS/PPSPixelDigiProducer/plugins/PPSPixelDigiProducer.cc | 2 +- SimPPS/PPSSimTrackProducer/plugins/BuildFile.xml | 1 + SimPPS/PPSSimTrackProducer/plugins/PPSSimTrackProducer.cc | 2 +- SimPPS/RPDigiProducer/plugins/BuildFile.xml | 1 + SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc | 2 +- SimTracker/SiPhase2Digitizer/plugins/BuildFile.xml | 1 + SimTracker/SiPhase2Digitizer/plugins/Phase2TrackerDigitizer.cc | 2 +- .../SiPhase2Digitizer/plugins/PreMixingPhase2TrackerWorker.cc | 2 +- SimTracker/SiPixelDigitizer/plugins/BuildFile.xml | 1 + SimTracker/SiPixelDigitizer/plugins/PreMixingSiPixelWorker.cc | 2 +- SimTracker/SiPixelDigitizer/plugins/SiPixelDigitizer.cc | 2 +- .../SiPixelDigitizer/plugins/SiPixelDigitizerAlgorithm.cc | 2 +- SimTracker/SiStripDigitizer/plugins/BuildFile.xml | 1 + SimTracker/SiStripDigitizer/plugins/PreMixingSiStripWorker.cc | 2 +- SimTracker/SiStripDigitizer/plugins/SiStripDigitizer.cc | 2 +- SimTransport/HectorProducer/BuildFile.xml | 1 + SimTransport/HectorProducer/src/HectorProducer.cc | 2 +- SimTransport/PPSProtonTransport/BuildFile.xml | 1 + SimTransport/PPSProtonTransport/interface/HectorTransport.h | 2 +- TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml | 1 + TauAnalysis/MCEmbeddingTools/plugins/EmbeddingLHEProducer.cc | 2 +- Validation/EcalDigis/plugins/BuildFile.xml | 1 + Validation/EcalDigis/plugins/EcalMixingModuleValidation.cc | 2 +- 191 files changed, 203 insertions(+), 138 deletions(-) rename FWCore/{Utilities => AbstractServices}/interface/RandomNumberGenerator.h (96%) create mode 100644 FWCore/AbstractServices/src/RandomNumberGenerator.cc delete mode 100644 FWCore/Utilities/src/RandomNumberGenerator.cc Switched to branch 'from-CMSSW_15_1_X_2025-03-27-1100'