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 + .../src/LaserBeamsBarrel.cc | 2 +- .../LaserAlignmentSimulation/src/LaserBeamsTEC1.cc | 2 +- .../LaserAlignmentSimulation/src/LaserBeamsTEC2.cc | 2 +- CalibMuon/DTCalibration/test/BuildFile.xml | 1 + CalibMuon/DTCalibration/test/DBTools/FakeTTrig.cc | 2 +- CalibPPS/AlignmentRelative/plugins/BuildFile.xml | 1 + .../plugins/PPSFastLocalSimulation.cc | 2 +- .../plugins/BuildFile.xml | 1 + .../SiPhase2BadStripConfigurableFakeESSource.cc | 2 +- CondTools/RPC/BuildFile.xml | 1 + CondTools/RPC/src/RPCDBPerformanceHandler.cc | 2 +- CondTools/SiPhase2Tracker/plugins/BuildFile.xml | 1 + .../plugins/SiPhase2BadStripChannelBuilder.cc | 2 +- EgammaAnalysis/ElectronTools/BuildFile.xml | 1 + .../ElectronTools/src/ElectronEnergyCalibrator.cc | 2 +- .../src/ElectronEnergyCalibratorRun2.cc | 2 +- .../src/PhotonEnergyCalibratorRun2.cc | 2 +- .../interface/RandomNumberGenerator.h | 10 ++-- .../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 +- .../plugins/TestInterProcessRandomProd.cc | 2 +- .../TestServicesOnNonFrameworkThreadsAnalyzer.cc | 2 +- FWCore/ServiceRegistry/BuildFile.xml | 1 + .../ServiceRegistry/interface/RandomEngineSentry.h | 2 +- .../ExternalRandomNumberGeneratorService.h | 2 +- FWCore/Utilities/src/RandomNumberGenerator.cc | 4 -- .../CTPPSRecHitProducer/plugins/BuildFile.xml | 1 + .../plugins/CTPPSRecHitProducer.cc | 2 +- .../TrackingRecHitProducer/BuildFile.xml | 1 + .../src/TrackingRecHitAlgorithm.cc | 2 +- FastSimulation/Utilities/BuildFile.xml | 1 + .../Utilities/src/RandomEngineAndDistribution.cc | 2 +- GeneratorInterface/Core/plugins/BuildFile.xml | 1 + .../Core/plugins/ExternalGeneratorFilter.cc | 2 +- .../EvtGenInterface/plugins/BuildFile.xml | 1 + .../plugins/EvtGen/EvtGenInterface.h | 2 +- .../GenFilters/plugins/BuildFile.xml | 1 + .../GenFilters/plugins/MinimumBiasFilter.cc | 2 +- .../plugins/BetaBoostEvtVtxGenerator.cc | 2 +- .../HiGenCommon/plugins/BuildFile.xml | 1 + .../HiGenCommon/plugins/HiCentralityBiasFilter.cc | 2 +- .../LHEInterface/plugins/BuildFile.xml | 1 + .../LHEInterface/plugins/ExternalLHEProducer.cc | 2 +- .../Pythia8Interface/plugins/BuildFile.xml | 2 + .../Pythia8Interface/plugins/Pythia8Hadronizer.cc | 68 +++++++++++----------- .../plugins/Pythia8HepMC3Hadronizer.cc | 2 +- GeneratorInterface/TauolaInterface/BuildFile.xml | 1 + .../TauolaInterface/interface/TauSpinnerCMS.h | 4 +- .../TauolaInterface/plugins/BuildFile.xml | 2 + .../plugins/TauSpinner/TauSpinnerCMS.cc | 2 +- .../plugins/TauSpinner/TauSpinnerFilter.cc | 4 +- .../plugins/Tauolapp/TauolappInterface.cc | 2 +- IOMC/EventVertexGenerators/BuildFile.xml | 1 + .../src/BaseEvtVtxGenerator.cc | 2 +- .../src/BeamDivergenceVtxGenerator.cc | 2 +- .../src/GaussianZBeamSpotFilter.cc | 2 +- .../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 +- .../ParticleGuns/src/CloseByParticleGunProducer.cc | 2 +- IOMC/ParticleGuns/src/ExpoRandomPGunProducer.cc | 2 +- IOMC/ParticleGuns/src/ExpoRandomPtGunProducer.cc | 2 +- .../src/FileRandomKEThetaGunProducer.cc | 2 +- .../src/FileRandomMultiParticlePGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatBaseThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomEGunProducer.cc | 2 +- .../src/FlatRandomEThetaGunProducer.cc | 2 +- .../src/FlatRandomMultiParticlePGunProducer.cc | 2 +- .../src/FlatRandomOneOverPtGunProducer.cc | 2 +- .../src/FlatRandomPtAndDxyGunProducer.cc | 2 +- IOMC/ParticleGuns/src/FlatRandomPtGunProducer.cc | 2 +- .../src/FlatRandomPtThetaGunProducer.cc | 2 +- .../src/GaussRandomPThetaGunProducer.cc | 2 +- .../src/MultiParticleInConeGunProducer.cc | 2 +- .../src/RandomMultiParticlePGunProducer.cc | 2 +- IOMC/ParticleGuns/src/RandomXiThetaGunProducer.cc | 2 +- IOMC/ParticleGuns/src/RandomtXiGunProducer.cc | 2 +- IOMC/RandomEngine/plugins/BuildFile.xml | 1 + .../plugins/RandomEngineStateProducer.cc | 2 +- IOMC/RandomEngine/plugins/RandomFilter.cc | 2 +- .../plugins/RandomNumberGeneratorService.h | 2 +- IOMC/RandomEngine/test/BuildFile.xml | 1 + .../test/TestRandomNumberServiceGlobal.cc | 2 +- IOPool/SecondaryInput/test/BuildFile.xml | 1 + IOPool/SecondaryInput/test/SecondaryProducer.cc | 2 +- L1Trigger/HardwareValidation/plugins/BuildFile.xml | 1 + .../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 + .../EgammaTools/src/ElectronEnergyCalibrator.cc | 2 +- .../EgammaTools/src/PhotonEnergyCalibrator.cc | 2 +- RecoJets/FFTJetProducers/plugins/BuildFile.xml | 1 + .../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 + .../CastorSim/plugins/CastorDigiProducer.cc | 2 +- SimCalorimetry/EcalSimAlgos/BuildFile.xml | 1 + .../EcalSimAlgos/src/ESElectronicsSim.cc | 2 +- .../EcalSimAlgos/src/EcalTimeMapDigitizer.cc | 4 -- SimCalorimetry/EcalSimProducers/BuildFile.xml | 1 + .../EcalSimProducers/src/EcalDigiProducer.cc | 3 +- .../EcalSimProducers/src/EcalDigiProducer_Ph2.cc | 2 +- .../HGCalSimProducers/plugins/BuildFile.xml | 1 + .../HGCalSimProducers/plugins/HGCDigiProducer.cc | 2 +- .../HGCalSimProducers/plugins/HGCDigitizer.cc | 2 +- .../plugins/PreMixingHGCalWorker.cc | 2 +- SimCalorimetry/HcalSimAlgos/test/BuildFile.xml | 3 +- .../HcalSimAlgos/test/SiPMNonlinearityAnalyzer.cc | 2 +- SimCalorimetry/HcalSimProducers/BuildFile.xml | 1 + .../HcalSimProducers/src/HcalDigiProducer.cc | 2 +- SimCalorimetry/HcalTestBeam/BuildFile.xml | 1 + .../HcalTestBeam/src/HcalTBDigiProducer.cc | 2 +- .../FastTimingCommon/plugins/BuildFile.xml | 1 + .../FastTimingCommon/plugins/MTDDigiProducer.cc | 2 +- .../FastTimingCommon/plugins/PreMixingMTDWorker.cc | 2 +- SimG4CMS/EcalTestBeam/plugins/BuildFile.xml | 1 + .../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 + .../plugins/DataMixingHcalDigiWorkerProd.cc | 2 +- SimGeneral/NoiseGenerators/test/BuildFile.xml | 1 + .../test/GaussianTailNoiseGeneratorTest.cc | 2 +- SimGeneral/PreMixingModule/plugins/BuildFile.xml | 1 + .../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 +- .../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 + .../plugins/PPSDirectProtonSimulation.cc | 2 +- SimPPS/PPSPixelDigiProducer/plugins/BuildFile.xml | 1 + .../plugins/PPSPixelDigiProducer.cc | 2 +- SimPPS/PPSSimTrackProducer/plugins/BuildFile.xml | 1 + .../plugins/PPSSimTrackProducer.cc | 2 +- SimPPS/RPDigiProducer/plugins/BuildFile.xml | 1 + SimPPS/RPDigiProducer/plugins/RPDigiProducer.cc | 2 +- SimTracker/SiPhase2Digitizer/plugins/BuildFile.xml | 1 + .../plugins/Phase2TrackerDigitizer.cc | 2 +- .../plugins/PreMixingPhase2TrackerWorker.cc | 2 +- SimTracker/SiPixelDigitizer/plugins/BuildFile.xml | 1 + .../plugins/PreMixingSiPixelWorker.cc | 2 +- .../SiPixelDigitizer/plugins/SiPixelDigitizer.cc | 2 +- .../plugins/SiPixelDigitizerAlgorithm.cc | 2 +- SimTracker/SiStripDigitizer/plugins/BuildFile.xml | 1 + .../plugins/PreMixingSiStripWorker.cc | 2 +- .../SiStripDigitizer/plugins/SiStripDigitizer.cc | 2 +- SimTransport/HectorProducer/BuildFile.xml | 1 + SimTransport/HectorProducer/src/HectorProducer.cc | 2 +- SimTransport/PPSProtonTransport/BuildFile.xml | 1 + .../PPSProtonTransport/interface/HectorTransport.h | 2 +- TauAnalysis/MCEmbeddingTools/plugins/BuildFile.xml | 1 + .../plugins/EmbeddingLHEProducer.cc | 2 +- Validation/EcalDigis/plugins/BuildFile.xml | 1 + .../plugins/EcalMixingModuleValidation.cc | 2 +- 191 files changed, 236 insertions(+), 171 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'