Skip to content

Commit 57cf61c

Browse files
cmsbuildcmsbuild
authored
Merge pull request #47719 from makortel/moveRandomNumberGenerator
Move RandomNumberGenerator service base class to `FWCore/AbstractServices`
2 parents 6fb233d + a04953e commit 57cf61c

File tree

191 files changed

+236
-171
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

191 files changed

+236
-171
lines changed

‎Alignment/CommonAlignment/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<use name="CondCore/CondDB"/>
55
<use name="DataFormats/GeometryCommonDetAlgo"/>
66
<use name="DataFormats/GeometrySurface"/>
7+
<use name="FWCore/AbstractServices"/>
78
<use name="FWCore/MessageLogger"/>
89
<use name="FWCore/ParameterSet"/>
910
<use name="FWCore/ServiceRegistry"/>

‎Alignment/CommonAlignment/src/AlignableModifier.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#include "CLHEP/Random/Randomize.h"
77

88
#include "DataFormats/GeometryCommonDetAlgo/interface/AlignmentPositionError.h"
9+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
910
#include "FWCore/ServiceRegistry/interface/Service.h"
10-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1111
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1212
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1313

‎Alignment/LaserAlignmentSimulation/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<use name="FWCore/AbstractServices"/>
12
<use name="FWCore/MessageLogger"/>
23
<use name="FWCore/ParameterSet"/>
34
<use name="FWCore/ServiceRegistry"/>

‎Alignment/LaserAlignmentSimulation/src/LaserBeamsBarrel.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsBarrel.h"
1010

11+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1112
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1213
#include "FWCore/ServiceRegistry/interface/Service.h"
13-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1414

1515
#include <CLHEP/Random/RandGaussQ.h>
1616
#include "G4ParticleDefinition.hh"

‎Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC1.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC1.h"
1010

11+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1112
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1213
#include "FWCore/ServiceRegistry/interface/Service.h"
13-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1414

1515
#include <CLHEP/Random/RandGaussQ.h>
1616
#include <CLHEP/Units/SystemOfUnits.h>

‎Alignment/LaserAlignmentSimulation/src/LaserBeamsTEC2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "Alignment/LaserAlignmentSimulation/interface/LaserBeamsTEC2.h"
1010

11+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1112
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1213
#include "FWCore/ServiceRegistry/interface/Service.h"
13-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1414

1515
#include <CLHEP/Random/RandGaussQ.h>
1616
#include <CLHEP/Units/SystemOfUnits.h>

‎CalibMuon/DTCalibration/test/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
<use name="Geometry/Records"/>
1111
<use name="Geometry/DTGeometry"/>
1212
<use name="DataFormats/MuonDetId"/>
13+
<use name="FWCore/AbstractServices"/>
1314
<use name="FWCore/ParameterSet"/>
1415
<use name="CondFormats/DTObjects"/>
1516
<use name="FWCore/Framework"/>

‎CalibMuon/DTCalibration/test/DBTools/FakeTTrig.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include "CondFormats/DataRecord/interface/DTTtrigRcd.h"
2828

2929
//Random generator
30+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
3031
#include "FWCore/ServiceRegistry/interface/Service.h"
3132
#include "FWCore/Utilities/interface/Exception.h"
32-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
3333
#include "CLHEP/Random/RandGaussQ.h"
3434

3535
// DTDigitizer

‎CalibPPS/AlignmentRelative/plugins/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<use name="hepmc"/>
55
<use name="clhep"/>
66

7+
<use name="FWCore/AbstractServices"/>
78
<use name="FWCore/Framework"/>
89
<use name="FWCore/ParameterSet"/>
910
<use name="FWCore/ServiceRegistry"/>

‎CalibPPS/AlignmentRelative/plugins/PPSFastLocalSimulation.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
* Jan Kašpar ([email protected])
44
****************************************************************************/
55

6+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
67
#include "FWCore/Framework/interface/stream/EDProducer.h"
78
#include "FWCore/Framework/interface/Event.h"
89
#include "FWCore/ParameterSet/interface/ParameterSet.h"
910
#include "FWCore/Framework/interface/MakerMacros.h"
1011
#include "FWCore/ServiceRegistry/interface/Service.h"
1112
#include "FWCore/Utilities/interface/ESGetToken.h"
12-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1313
#include "FWCore/Framework/interface/EventSetup.h"
1414
#include "FWCore/Framework/interface/ESHandle.h"
1515

‎CalibTracker/SiPhase2TrackerESProducers/plugins/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<use name="CondFormats/SiPhase2TrackerObjects"/>
44
<use name="CondFormats/SiStripObjects"/> <!-- needed for the SiStripBadStrip -->
55
<use name="DataFormats/SiStripDetId"/>
6+
<use name="FWCore/AbstractServices"/>
67
<use name="FWCore/Framework"/>
78
<use name="FWCore/MessageLogger"/>
89
<use name="Geometry/CommonDetUnit" source_only="1"/>

‎CalibTracker/SiPhase2TrackerESProducers/plugins/SiPhase2BadStripConfigurableFakeESSource.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "DataFormats/SiStripDetId/interface/SiStripDetId.h"
2222
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
2323
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
24+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
2425
#include "FWCore/Framework/interface/ESProducer.h"
2526
#include "FWCore/Framework/interface/EventSetupRecordIntervalFinder.h"
2627
#include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -29,7 +30,6 @@
2930
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
3031
#include "FWCore/ServiceRegistry/interface/Service.h"
3132
#include "FWCore/Utilities/interface/Exception.h"
32-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
3333
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
3434
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
3535
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

‎CondTools/RPC/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
<use name="CondFormats/DataRecord"/>
33
<use name="CondCore/PopCon"/>
44
<use name="CondCore/DBOutputService"/>
5+
<use name="FWCore/AbstractServices"/>
56
<use name="FWCore/Framework"/>
67
<use name="FWCore/ParameterSet"/>
78
<use name="FWCore/ServiceRegistry"/>

‎CondTools/RPC/src/RPCDBPerformanceHandler.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "FWCore/Framework/interface/ESHandle.h"
2222
#include "Geometry/Records/interface/MuonGeometryRecord.h"
2323
#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
24+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
2425
#include "FWCore/ServiceRegistry/interface/Service.h"
25-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
2626
#include "FWCore/Framework/interface/Event.h"
2727
#include "FWCore/Framework/interface/EventSetup.h"
2828
#include "FWCore/ParameterSet/interface/ParameterSet.h"

‎CondTools/SiPhase2Tracker/plugins/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<use name="FWCore/AbstractServices"/>
12
<use name="FWCore/Framework"/>
23
<use name="FWCore/ParameterSet"/>
34
<use name="FWCore/ServiceRegistry"/>

‎CondTools/SiPhase2Tracker/plugins/SiPhase2BadStripChannelBuilder.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
#include "DataFormats/SiStripDetId/interface/StripSubdetector.h"
1111
#include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
1212
#include "DataFormats/Phase2TrackerDigi/interface/Phase2TrackerDigi.h"
13+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1314
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1415
#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
1516
#include "FWCore/ParameterSet/interface/FileInPath.h"
1617
#include "FWCore/ParameterSet/interface/ParameterSet.h"
1718
#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
1819
#include "FWCore/ServiceRegistry/interface/Service.h"
1920
#include "FWCore/Utilities/interface/Exception.h"
20-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
2121
#include "Geometry/CommonDetUnit/interface/PixelGeomDetUnit.h"
2222
#include "Geometry/CommonTopologies/interface/PixelTopology.h"
2323
#include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"

‎EgammaAnalysis/ElectronTools/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<use name="CommonTools/Egamma"/>
2+
<use name="FWCore/AbstractServices"/>
23
<use name="FWCore/ServiceRegistry"/>
34
<use name="FWCore/Utilities"/>
45
<use name="FWCore/ParameterSet"/>

‎EgammaAnalysis/ElectronTools/src/ElectronEnergyCalibrator.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
#include <CLHEP/Random/RandGaussQ.h>
44
#include <CLHEP/Random/RandFlat.h>
55
#include <CLHEP/Random/Random.h>
6+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
67
#include "FWCore/ServiceRegistry/interface/Service.h"
7-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
88
#include "FWCore/Utilities/interface/Exception.h"
99

1010
/****************************************************************************

‎EgammaAnalysis/ElectronTools/src/ElectronEnergyCalibratorRun2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "EgammaAnalysis/ElectronTools/interface/ElectronEnergyCalibratorRun2.h"
22
#include <CLHEP/Random/RandGaussQ.h>
3+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
34
#include "FWCore/ServiceRegistry/interface/Service.h"
4-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
55
#include "FWCore/Utilities/interface/Exception.h"
66

77
ElectronEnergyCalibratorRun2::ElectronEnergyCalibratorRun2(EpCombinationTool &combinator,

‎EgammaAnalysis/ElectronTools/src/PhotonEnergyCalibratorRun2.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "EgammaAnalysis/ElectronTools/interface/PhotonEnergyCalibratorRun2.h"
22
#include <CLHEP/Random/RandGaussQ.h>
3+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
34
#include "FWCore/ServiceRegistry/interface/Service.h"
4-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
55
#include "FWCore/Utilities/interface/Exception.h"
66

77
PhotonEnergyCalibratorRun2::PhotonEnergyCalibratorRun2(bool isMC, bool synchronization, std::string correctionFile)

‎FWCore/Utilities/interface/RandomNumberGenerator.h renamed to ‎FWCore/AbstractServices/interface/RandomNumberGenerator.h

+6-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef FWCore_Utilities_RandomNumberGenerator_h
2-
#define FWCore_Utilities_RandomNumberGenerator_h
1+
#ifndef FWCore_AbstractServices_RandomNumberGenerator_h
2+
#define FWCore_AbstractServices_RandomNumberGenerator_h
33

44
/** \class edm::RandomNumberGenerator
55
@@ -146,9 +146,11 @@ namespace edm {
146146

147147
class RandomNumberGenerator {
148148
public:
149-
RandomNumberGenerator() {}
149+
RandomNumberGenerator() = default;
150150
RandomNumberGenerator(RandomNumberGenerator const&) = delete;
151-
RandomNumberGenerator const& operator=(RandomNumberGenerator const&) = delete;
151+
RandomNumberGenerator& operator=(RandomNumberGenerator const&) = delete;
152+
RandomNumberGenerator(RandomNumberGenerator&&) = delete;
153+
RandomNumberGenerator& operator=(RandomNumberGenerator&&) = delete;
152154
virtual ~RandomNumberGenerator();
153155

154156
/// Use the next 2 functions to get the random number engine.

‎FWCore/AbstractServices/src/RandomNumberGenerator.cc

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
2+
3+
edm::RandomNumberGenerator::~RandomNumberGenerator() = default;

‎FWCore/Framework/src/EventProcessor.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include "FWCore/ParameterSet/interface/Registry.h"
5656
#include "FWCore/ParameterSet/interface/validateTopLevelParameterSets.h"
5757

58+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
5859
#include "FWCore/AbstractServices/interface/RootHandlers.h"
5960

6061
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
@@ -72,7 +73,6 @@
7273
#include "FWCore/Utilities/interface/EDMException.h"
7374
#include "FWCore/Utilities/interface/Exception.h"
7475
#include "FWCore/Utilities/interface/ConvertException.h"
75-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
7676
#include "FWCore/Utilities/interface/UnixSignalHandlers.h"
7777
#include "FWCore/Utilities/interface/ExceptionCollector.h"
7878
#include "FWCore/Utilities/interface/StreamID.h"

‎FWCore/Framework/src/Schedule.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
#include "DataFormats/Provenance/interface/ThinnedAssociationsHelper.h"
88
#include "DataFormats/Provenance/interface/BranchIDListHelper.h"
99
#include "DataFormats/Provenance/interface/ProductResolverIndexHelper.h"
10+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1011
#include "FWCore/Common/interface/ProcessBlockHelper.h"
1112
#include "FWCore/Framework/interface/EDConsumerBase.h"
1213
#include "FWCore/Framework/interface/ModuleProcessName.h"
@@ -34,7 +35,6 @@
3435
#include "FWCore/Utilities/interface/Algorithms.h"
3536
#include "FWCore/Utilities/interface/ConvertException.h"
3637
#include "FWCore/Utilities/interface/ExceptionCollector.h"
37-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
3838
#include "FWCore/Utilities/interface/TypeID.h"
3939
#include "FWCore/Utilities/interface/thread_safety_macros.h"
4040

‎FWCore/Integration/plugins/BuildFile.xml

+3
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106

107107
<library file="TestInterProcessProd.cc" name="TestInterProcessProd">
108108
<flags EDM_PLUGIN="1"/>
109+
<use name="FWCore/AbstractServices"/>
109110
<use name="FWCore/Framework"/>
110111
<use name="FWCore/ParameterSet"/>
111112
<use name="FWCore/Sources"/>
@@ -115,6 +116,7 @@
115116

116117
<library file="TestInterProcessRandomProd.cc,RandomIntProducer.cc" name="TestInterProcessRandomProd">
117118
<flags EDM_PLUGIN="1"/>
119+
<use name="FWCore/AbstractServices"/>
118120
<use name="FWCore/Framework"/>
119121
<use name="FWCore/ParameterSet"/>
120122
<use name="FWCore/Sources"/>
@@ -126,6 +128,7 @@
126128
</library>
127129
<library file="TestServicesOnNonFrameworkThreadsAnalyzer.cc" name = "TestServicesOnNonFrameworkThreadsAnalyzer">
128130
<flags EDM_PLUGIN="1"/>
131+
<use name="FWCore/AbstractServices"/>
129132
<use name="FWCore/Framework"/>
130133
<use name="FWCore/ParameterSet"/>
131134
<use name="FWCore/MessageLogger"/>

‎FWCore/Integration/plugins/RandomIntProducer.cc

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
2+
13
#include "FWCore/Framework/interface/one/EDProducer.h"
24
#include "FWCore/Framework/interface/MakerMacros.h"
35
#include "FWCore/Framework/interface/Event.h"
46
#include "FWCore/Framework/interface/LuminosityBlock.h"
57

6-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
78
#include "FWCore/Utilities/interface/EDPutToken.h"
89
#include "FWCore/Utilities/interface/Transition.h"
910
#include "FWCore/ServiceRegistry/interface/Service.h"

‎FWCore/Integration/plugins/TestInterProcessRandomProd.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include "DataFormats/TestObjects/interface/ThingCollection.h"
88
#include "DataFormats/Common/interface/RandomNumberGeneratorState.h"
99

10+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1011
#include "FWCore/ServiceRegistry/interface/Service.h"
11-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1212

1313
#include <cstdio>
1414
#include <iostream>

‎FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
12
#include "FWCore/Framework/interface/stream/EDAnalyzer.h"
23
#include "FWCore/Framework/interface/MakerMacros.h"
34
#include "FWCore/Framework/interface/Event.h"
45
#include "FWCore/Framework/interface/ModuleContextSentry.h"
56
#include "FWCore/ServiceRegistry/interface/ServiceRegistry.h"
67
#include "FWCore/ServiceRegistry/interface/Service.h"
78

8-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
99
#include "FWCore/MessageLogger/interface/MessageLogger.h"
1010
#include "FWCore/MessageLogger/interface/edm_MessageLogger.h"
1111
#include <thread>

‎FWCore/ServiceRegistry/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<use name="DataFormats/Provenance"/>
2+
<use name="FWCore/AbstractServices"/>
23
<use name="FWCore/ParameterSet"/>
34
<use name="FWCore/PluginManager"/>
45
<use name="FWCore/Utilities"/>

‎FWCore/ServiceRegistry/interface/RandomEngineSentry.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
// Original Author: W. David Dagenhart
1111
// Created: 11/26/2013
1212

13+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1314
#include "FWCore/ServiceRegistry/interface/Service.h"
1415
#include "FWCore/Utilities/interface/Exception.h"
15-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
1616
#include "FWCore/Utilities/interface/get_underlying_safe.h"
1717

1818
namespace CLHEP {

‎FWCore/Services/interface/ExternalRandomNumberGeneratorService.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include <memory>
1414
#include <vector>
1515

16-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
16+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
1717

1818
namespace edm {
1919

‎FWCore/Utilities/src/RandomNumberGenerator.cc

-4
This file was deleted.

‎FastSimulation/CTPPSRecHitProducer/plugins/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<use name="FWCore/AbstractServices"/>
12
<use name="FWCore/Framework"/>
23
<use name="FWCore/ParameterSet"/>
34
<use name="SimDataFormats/TrackingHit"/>

‎FastSimulation/CTPPSRecHitProducer/plugins/CTPPSRecHitProducer.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Description: [one line class summary]
3232
#include <cmath>
3333

3434
#include <CLHEP/Random/RandGauss.h>
35-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
35+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
3636
#include "FWCore/Utilities/interface/Exception.h"
3737
#include "FWCore/ServiceRegistry/interface/Service.h"
3838

‎FastSimulation/TrackingRecHitProducer/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
<use name="DataFormats/GeometryVector"/>
44
<use name="DataFormats/SiStripDetId"/>
55
<use name="DataFormats/TrackerRecHit2D"/>
6+
<use name="FWCore/AbstractServices"/>
67
<use name="FWCore/Framework"/>
78
<use name="FWCore/MessageLogger"/>
89
<use name="FWCore/ParameterSet"/>

‎FastSimulation/TrackingRecHitProducer/src/TrackingRecHitAlgorithm.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#include "FastSimulation/TrackingRecHitProducer/interface/TrackingRecHitAlgorithm.h"
22

3+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
34
#include "FWCore/ParameterSet/interface/ParameterSet.h"
45
#include "FWCore/Framework/interface/Event.h"
56
#include "FWCore/Framework/interface/EventSetup.h"
67
#include "FWCore/Framework/interface/ConsumesCollector.h"
78
#include "FWCore/ServiceRegistry/interface/Service.h"
8-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
99

1010
#include "DataFormats/DetId/interface/DetId.h"
1111
#include "DataFormats/TrackerRecHit2D/interface/FastSingleTrackerRecHit.h"

‎FastSimulation/Utilities/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<use name="FWCore/AbstractServices"/>
12
<use name="FWCore/ServiceRegistry"/>
23
<use name="FWCore/Utilities"/>
34
<use name="clhep"/>

‎FastSimulation/Utilities/src/RandomEngineAndDistribution.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "FastSimulation/Utilities/interface/RandomEngineAndDistribution.h"
22

3+
#include "FWCore/AbstractServices/interface/RandomNumberGenerator.h"
34
#include "FWCore/ServiceRegistry/interface/Service.h"
4-
#include "FWCore/Utilities/interface/RandomNumberGenerator.h"
55
#include "FWCore/Utilities/interface/Exception.h"
66

77
#include "CLHEP/Random/RandomEngine.h"

‎GeneratorInterface/Core/plugins/BuildFile.xml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<use name="FWCore/AbstractServices"/>
12
<use name="FWCore/Framework"/>
23
<use name="FWCore/ParameterSet"/>
34
<use name="FWCore/MessageLogger"/>

0 commit comments

Comments
 (0)