Merge pull request cms-sw#1473 from Dr15Jones/removeUpdaterService

ktf · ktf · commit 6c65770936c2 · 2013-11-19T00:25:40.000-08:00
Multithreading fixes -- Removed UpdaterService
diff --git a/DQM/DataScouting/test/HLTvsRECOstudies/hlt_data.py b/DQM/DataScouting/test/HLTvsRECOstudies/hlt_data.py
@@ -5163,8 +5163,6 @@
       '28_bunches',
       '5e32' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/FWCore/Services/interface/UpdaterService.h b/FWCore/Services/interface/UpdaterService.h
diff --git a/FWCore/Services/plugins/Module.cc b/FWCore/Services/plugins/Module.cc
@@ -12,7 +12,6 @@
 #include "FWCore/Services/src/PrintEventSetupDataRetrieval.h"
 #include "FWCore/ServiceRegistry/interface/ServiceMaker.h"
 #include "FWCore/Services/interface/PrintLoadingPlugins.h"
-#include "FWCore/Services/interface/UpdaterService.h"
 
 using edm::service::JobReportService;
 using edm::service::Tracer;
@@ -28,7 +27,6 @@ using edm::PrintEventSetupDataRetrieval;
 
 DEFINE_FWK_SERVICE(Tracer);
 DEFINE_FWK_SERVICE(Timing);
-DEFINE_FWK_SERVICE(UpdaterService);
 DEFINE_FWK_SERVICE(CPU);
 DEFINE_FWK_SERVICE(PrintEventSetupDataRetrieval);
 
diff --git a/FWCore/Services/src/UpdaterService.cc b/FWCore/Services/src/UpdaterService.cc
diff --git a/HLTrigger/Configuration/python/HLT_8E33v2_cff.py b/HLTrigger/Configuration/python/HLT_8E33v2_cff.py
@@ -4125,8 +4125,6 @@
   fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),
   getSCInfo = cms.untracked.bool( True )
 )
-UpdaterService = cms.Service( "UpdaterService",
-)
 
 hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/python/HLT_FULL_cff.py b/HLTrigger/Configuration/python/HLT_FULL_cff.py
@@ -5363,8 +5363,6 @@
   fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),
   getSCInfo = cms.untracked.bool( True )
 )
-UpdaterService = cms.Service( "UpdaterService",
-)
 
 hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/python/HLT_GRun_cff.py b/HLTrigger/Configuration/python/HLT_GRun_cff.py
@@ -4324,8 +4324,6 @@
   fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),
   getSCInfo = cms.untracked.bool( True )
 )
-UpdaterService = cms.Service( "UpdaterService",
-)
 
 hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/python/HLT_HIon_cff.py b/HLTrigger/Configuration/python/HLT_HIon_cff.py
@@ -2910,8 +2910,6 @@
   fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),
   getSCInfo = cms.untracked.bool( True )
 )
-UpdaterService = cms.Service( "UpdaterService",
-)
 
 hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/python/HLT_PIon_cff.py b/HLTrigger/Configuration/python/HLT_PIon_cff.py
@@ -3350,8 +3350,6 @@
   fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),
   getSCInfo = cms.untracked.bool( True )
 )
-UpdaterService = cms.Service( "UpdaterService",
-)
 
 hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/python/Tools/confdb.py b/HLTrigger/Configuration/python/Tools/confdb.py
@@ -962,8 +962,6 @@ def buildOptions(self):
       self.options['esmodules'].append( "-CaloTowerConstituentsMapBuilder" )
       self.options['esmodules'].append( "-CaloTopologyBuilder" )
 
-      self.options['services'].append( "-UpdaterService" )
-
       self.options['modules'].append( "hltL3MuonIsolations" )
       self.options['modules'].append( "hltPixelVertices" )
       self.options['modules'].append( "-hltCkfL1SeededTrackCandidates" )
diff --git a/HLTrigger/Configuration/test/OnData_HLT_8E33v2.py b/HLTrigger/Configuration/test/OnData_HLT_8E33v2.py
@@ -6054,8 +6054,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnData_HLT_GRun.py b/HLTrigger/Configuration/test/OnData_HLT_GRun.py
@@ -6262,8 +6262,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnData_HLT_HIon.py b/HLTrigger/Configuration/test/OnData_HLT_HIon.py
@@ -3717,8 +3717,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnData_HLT_PIon.py b/HLTrigger/Configuration/test/OnData_HLT_PIon.py
@@ -4424,8 +4424,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_8E33v2.py b/HLTrigger/Configuration/test/OnLine_HLT_8E33v2.py
@@ -6054,8 +6054,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py
@@ -6262,8 +6262,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py
@@ -3717,8 +3717,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py
@@ -4424,8 +4424,6 @@
       'CirculatingBeam',
       'CirculatingBeam+HighRandom' )
 )
-process.UpdaterService = cms.Service( "UpdaterService",
-)
 
 process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/HLTrigger/HLTanalyzers/python/HLT_FULL_cff.py b/HLTrigger/HLTanalyzers/python/HLT_FULL_cff.py
@@ -4245,8 +4245,6 @@
   fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),
   getSCInfo = cms.untracked.bool( True )
 )
-UpdaterService = cms.Service( "UpdaterService",
-)
 
 hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",
     toGet = cms.VPSet( 
diff --git a/RecoTracker/CkfPattern/src/CkfTrajectoryBuilder.cc b/RecoTracker/CkfPattern/src/CkfTrajectoryBuilder.cc
@@ -25,8 +25,6 @@
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
 #include "TrackingTools/PatternTools/interface/TransverseImpactPointExtrapolator.h"
 
-#include "FWCore/Services/interface/UpdaterService.h"
-
 using namespace std;
 
 
diff --git a/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc b/RecoTracker/MeasurementDet/plugins/MeasurementTrackerImpl.cc
@@ -35,9 +35,6 @@
 #include "CondFormats/SiStripObjects/interface/SiStripNoises.h"
 #include "CondFormats/DataRecord/interface/SiStripNoisesRcd.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Services/interface/UpdaterService.h"
-
 #include <iostream>
 #include <typeinfo>
 #include <map>
diff --git a/RecoTracker/MeasurementDet/plugins/OnDemandMeasurementTracker.cc b/RecoTracker/MeasurementDet/plugins/OnDemandMeasurementTracker.cc
@@ -46,9 +46,6 @@
 #include <DataFormats/GeometrySurface/interface/BoundPlane.h>
 #include "DataFormats/Math/interface/deltaR.h"
 
-#include "FWCore/ServiceRegistry/interface/Service.h"
-#include "FWCore/Services/interface/UpdaterService.h"
-
 using namespace std;
 
 OnDemandMeasurementTracker::OnDemandMeasurementTracker(const edm::ParameterSet&              conf,
diff --git a/RecoTracker/MeasurementDet/python/MeasurementTrackerESProducer_cff.py b/RecoTracker/MeasurementDet/python/MeasurementTrackerESProducer_cff.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoTracker.MeasurementDet.UpdaterService_cfi import *
 from RecoTracker.MeasurementDet.MeasurementTrackerESProducer_cfi import *
 
diff --git a/RecoTracker/MeasurementDet/python/OnDemandMeasurementTrackerESProducer_cff.py b/RecoTracker/MeasurementDet/python/OnDemandMeasurementTrackerESProducer_cff.py
@@ -1,5 +1,4 @@
 import FWCore.ParameterSet.Config as cms
 
-from RecoTracker.MeasurementDet.UpdaterService_cfi import *
 from RecoTracker.MeasurementDet.OnDemandMeasurementTrackerESProducer_cfi import *
 
diff --git a/RecoTracker/MeasurementDet/python/UpdaterService_cfi.py b/RecoTracker/MeasurementDet/python/UpdaterService_cfi.py

Original file line number	Diff line number	Diff line change
`@@ -5163,8 +5163,6 @@`
`5163`	`5163`	`'28_bunches',`
`5164`	`5164`	`'5e32' )`
`5165`	`5165`	`)`
`5166`		`-process.UpdaterService = cms.Service( "UpdaterService",`
`5167`		`-)`
`5168`	`5166`
`5169`	`5167`	`process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`5170`	`5168`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -4125,8 +4125,6 @@`
`4125`	`4125`	`fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),`
`4126`	`4126`	`getSCInfo = cms.untracked.bool( True )`
`4127`	`4127`	`)`
`4128`		`-UpdaterService = cms.Service( "UpdaterService",`
`4129`		`-)`
`4130`	`4128`
`4131`	`4129`	`hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`4132`	`4130`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -5363,8 +5363,6 @@`
`5363`	`5363`	`fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),`
`5364`	`5364`	`getSCInfo = cms.untracked.bool( True )`
`5365`	`5365`	`)`
`5366`		`-UpdaterService = cms.Service( "UpdaterService",`
`5367`		`-)`
`5368`	`5366`
`5369`	`5367`	`hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`5370`	`5368`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -4324,8 +4324,6 @@`
`4324`	`4324`	`fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),`
`4325`	`4325`	`getSCInfo = cms.untracked.bool( True )`
`4326`	`4326`	`)`
`4327`		`-UpdaterService = cms.Service( "UpdaterService",`
`4328`		`-)`
`4329`	`4327`
`4330`	`4328`	`hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`4331`	`4329`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -2910,8 +2910,6 @@`
`2910`	`2910`	`fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),`
`2911`	`2911`	`getSCInfo = cms.untracked.bool( True )`
`2912`	`2912`	`)`
`2913`		`-UpdaterService = cms.Service( "UpdaterService",`
`2914`		`-)`
`2915`	`2913`
`2916`	`2914`	`hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`2917`	`2915`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -3350,8 +3350,6 @@`
`3350`	`3350`	`fedIntegrityFolder = cms.untracked.string( "DT/FEDIntegrity_EvF" ),`
`3351`	`3351`	`getSCInfo = cms.untracked.bool( True )`
`3352`	`3352`	`)`
`3353`		`-UpdaterService = cms.Service( "UpdaterService",`
`3354`		`-)`
`3355`	`3353`
`3356`	`3354`	`hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`3357`	`3355`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -6054,8 +6054,6 @@`
`6054`	`6054`	`'CirculatingBeam',`
`6055`	`6055`	`'CirculatingBeam+HighRandom' )`
`6056`	`6056`	`)`
`6057`		`-process.UpdaterService = cms.Service( "UpdaterService",`
`6058`		`-)`
`6059`	`6057`
`6060`	`6058`	`process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`6061`	`6059`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -6262,8 +6262,6 @@`
`6262`	`6262`	`'CirculatingBeam',`
`6263`	`6263`	`'CirculatingBeam+HighRandom' )`
`6264`	`6264`	`)`
`6265`		`-process.UpdaterService = cms.Service( "UpdaterService",`
`6266`		`-)`
`6267`	`6265`
`6268`	`6266`	`process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`6269`	`6267`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -3717,8 +3717,6 @@`
`3717`	`3717`	`'CirculatingBeam',`
`3718`	`3718`	`'CirculatingBeam+HighRandom' )`
`3719`	`3719`	`)`
`3720`		`-process.UpdaterService = cms.Service( "UpdaterService",`
`3721`		`-)`
`3722`	`3720`
`3723`	`3721`	`process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`3724`	`3722`	`toGet = cms.VPSet(`
Original file line number	Diff line number	Diff line change
`@@ -4424,8 +4424,6 @@`
`4424`	`4424`	`'CirculatingBeam',`
`4425`	`4425`	`'CirculatingBeam+HighRandom' )`
`4426`	`4426`	`)`
`4427`		`-process.UpdaterService = cms.Service( "UpdaterService",`
`4428`		`-)`
`4429`	`4427`
`4430`	`4428`	`process.hltGetConditions = cms.EDAnalyzer( "EventSetupRecordDataGetter",`
`4431`	`4429`	`toGet = cms.VPSet(`