diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py index 787516e5b5da6..ef849484150b8 100644 --- a/Configuration/Applications/python/ConfigBuilder.py +++ b/Configuration/Applications/python/ConfigBuilder.py @@ -382,13 +382,13 @@ def addCommon(self): self.addedObjects.append(("","options")) if self._options.lazy_download: - self.process.AdaptorConfig = cms.Service("AdaptorConfig", + self.process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(True), enable = cms.untracked.bool(True), cacheHint = cms.untracked.string("lazy-download"), readHint = cms.untracked.string("read-ahead-buffered") ) - self.addedObjects.append(("Setup lazy download","AdaptorConfig")) + self.addedObjects.append(("Setup lazy download","TFileAdaptor")) #self.process.cmsDriverCommand = cms.untracked.PSet( command=cms.untracked.string('cmsDriver.py '+self._options.arguments) ) #self.addedObjects.append(("what cmsDriver command was used","cmsDriverCommand")) diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py index 87398bcdce545..0fab57cdf23d3 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-file_cfg.py @@ -123,7 +123,7 @@ #-------------------------- process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Message Logger diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py index 558207c556b5e..2b6429ced8b4d 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-live_cfg.py @@ -72,7 +72,7 @@ #-------------------------- process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Message Logger diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py index 5e41b6d6bff27..861a8ae8b62f4 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-playback_cfg.py @@ -89,7 +89,7 @@ #-------------------------- process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Message Logger diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py index 12b24b80ac99c..4a583747e25e8 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient-rawfile_cfg.py @@ -138,7 +138,7 @@ #-------------------------- process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Message Logger diff --git a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py index 54d08592ed459..653983ddde626 100644 --- a/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py +++ b/DQM/CSCMonitorModule/python/test/csc_dqm_sourceclient_offline-file_cfg.py @@ -100,7 +100,7 @@ #-------------------------- process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Message Logger diff --git a/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py b/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py index 62cf063e692de..ceef7366d3db5 100644 --- a/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py +++ b/DQM/CSCMonitorModule/test/dqm_dev_test_new_unpacker.py @@ -123,7 +123,7 @@ #-------------------------- #process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -#process.AdaptorConfig = cms.Service("AdaptorConfig") +# #-------------------------- # Message Logger diff --git a/DQM/CSCMonitorModule/test/dqm_repacker_test.py b/DQM/CSCMonitorModule/test/dqm_repacker_test.py index c86b6ab983a06..a792a3cc72154 100644 --- a/DQM/CSCMonitorModule/test/dqm_repacker_test.py +++ b/DQM/CSCMonitorModule/test/dqm_repacker_test.py @@ -123,7 +123,7 @@ #-------------------------- #process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -#process.AdaptorConfig = cms.Service("AdaptorConfig") +# #-------------------------- # Message Logger diff --git a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py index 7453133c949b3..bbea0f104abbd 100644 --- a/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/csc_dqm_sourceclient-live_cfg.py @@ -138,7 +138,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Message Logger diff --git a/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py index 135f81136a712..b2fb47202f1e6 100644 --- a/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/mutracking_dqm_sourceclient-live_cfg.py @@ -159,7 +159,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Filters diff --git a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py index 142d073aeb839..60da2545948ce 100644 --- a/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixel_dqm_sourceclient-live_cfg.py @@ -145,7 +145,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Filters diff --git a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py index 5cac77bc20e5f..f65b9bedb59a7 100644 --- a/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/pixellumi_dqm_sourceclient-live_cfg.py @@ -125,7 +125,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Filters diff --git a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py index ad76a5fe0e7ea..cd8232cc13f20 100644 --- a/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_approx_dqm_sourceclient-live_cfg.py @@ -118,7 +118,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + # Simple filter for event process.eventFilter = cms.EDFilter("SimpleEventFilter", diff --git a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py index f73b97a34f1e9..bbca885a0747e 100644 --- a/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py +++ b/DQM/Integration/python/clients/sistrip_dqm_sourceclient-live_cfg.py @@ -168,7 +168,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + # Simple filter for event process.eventFilter = cms.EDFilter("SimpleEventFilter", diff --git a/DQM/MuonMonitor/test/mutracking_dqm_sourceclient-live_cfg.py b/DQM/MuonMonitor/test/mutracking_dqm_sourceclient-live_cfg.py index 445ffdd587bd9..2d9aae4aa1938 100644 --- a/DQM/MuonMonitor/test/mutracking_dqm_sourceclient-live_cfg.py +++ b/DQM/MuonMonitor/test/mutracking_dqm_sourceclient-live_cfg.py @@ -210,4 +210,4 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + diff --git a/DQM/SiPixelCommon/python/reco_calib_source_client_cfg.py b/DQM/SiPixelCommon/python/reco_calib_source_client_cfg.py index 0633b0e5f71a6..d47737eedc6b4 100644 --- a/DQM/SiPixelCommon/python/reco_calib_source_client_cfg.py +++ b/DQM/SiPixelCommon/python/reco_calib_source_client_cfg.py @@ -46,7 +46,7 @@ destinations = cms.untracked.vstring('cout') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", StaticUpdateFrequency = cms.untracked.int32(10), diff --git a/DQM/SiPixelCommon/test/client_template_calib_cfg.py b/DQM/SiPixelCommon/test/client_template_calib_cfg.py index e374b1887e5ae..7c77560e8be5b 100644 --- a/DQM/SiPixelCommon/test/client_template_calib_cfg.py +++ b/DQM/SiPixelCommon/test/client_template_calib_cfg.py @@ -117,7 +117,7 @@ destinations = cms.untracked.vstring('TEXTFILE') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", EventOffsetForInit = cms.untracked.int32(10), diff --git a/DQM/SiPixelCommon/test/client_template_cfg.py b/DQM/SiPixelCommon/test/client_template_cfg.py index b3788fe070f5e..4dda753405063 100644 --- a/DQM/SiPixelCommon/test/client_template_cfg.py +++ b/DQM/SiPixelCommon/test/client_template_cfg.py @@ -79,7 +79,7 @@ # destinations = cms.untracked.vstring('TEXTFILE') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + # DQM modules: process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", diff --git a/DQM/SiPixelCommon/test/client_template_physics_cfg.py b/DQM/SiPixelCommon/test/client_template_physics_cfg.py index 43f9c6ecdc933..eda6d3262d8cb 100644 --- a/DQM/SiPixelCommon/test/client_template_physics_cfg.py +++ b/DQM/SiPixelCommon/test/client_template_physics_cfg.py @@ -102,7 +102,7 @@ destinations = cms.untracked.vstring('TEXTFILE') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", EventOffsetForInit = cms.untracked.int32(10), diff --git a/DQM/SiPixelCommon/test/pixel_reco_dqm_cfg.py b/DQM/SiPixelCommon/test/pixel_reco_dqm_cfg.py index 9215beccc7af3..e3989834fe442 100644 --- a/DQM/SiPixelCommon/test/pixel_reco_dqm_cfg.py +++ b/DQM/SiPixelCommon/test/pixel_reco_dqm_cfg.py @@ -61,7 +61,7 @@ destinations = cms.untracked.vstring('cout') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", FileSaveFrequency = cms.untracked.int32(50), diff --git a/DQM/SiPixelCommon/test/reco_calib_source_client_cfg.py b/DQM/SiPixelCommon/test/reco_calib_source_client_cfg.py index 0633b0e5f71a6..d47737eedc6b4 100644 --- a/DQM/SiPixelCommon/test/reco_calib_source_client_cfg.py +++ b/DQM/SiPixelCommon/test/reco_calib_source_client_cfg.py @@ -46,7 +46,7 @@ destinations = cms.untracked.vstring('cout') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", StaticUpdateFrequency = cms.untracked.int32(10), diff --git a/DQM/SiPixelMonitorClient/python/pixel_dqm_sourceclient-file_cfg.py b/DQM/SiPixelMonitorClient/python/pixel_dqm_sourceclient-file_cfg.py index 9f17e3ea22fd8..0fd864be85945 100644 --- a/DQM/SiPixelMonitorClient/python/pixel_dqm_sourceclient-file_cfg.py +++ b/DQM/SiPixelMonitorClient/python/pixel_dqm_sourceclient-file_cfg.py @@ -54,7 +54,7 @@ destinations = cms.untracked.vstring('cout') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.sipixelEDAClient = DQMEDHarvester("SiPixelEDAClient", FileSaveFrequency = cms.untracked.int32(50), diff --git a/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py b/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py index 62425d368a371..1de75858ae770 100644 --- a/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py +++ b/DQM/SiPixelMonitorClient/test/pixel_dqm_sourceclient-file_cfg.py @@ -73,7 +73,7 @@ ), destinations = cms.untracked.vstring('cout') ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py index a8bd3f6fca8a5..29333dbea6983 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorHitEfficiency_data_cfg.py @@ -110,7 +110,7 @@ ) process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + ## diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py index 05606d081afcb..d2bbf300b0b3e 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_data_cfg.py @@ -120,7 +120,7 @@ ) process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + ## diff --git a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py index 2087283dbb793..d569e8ade80f3 100644 --- a/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py +++ b/DQM/SiPixelMonitorTrack/test/SiPixelMonitorTrackResiduals_relval_cfg.py @@ -54,7 +54,7 @@ ) process.ModuleWebRegistry = cms.Service("ModuleWebRegistry") -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.siPixelLocalReco = cms.Sequence(process.siPixelDigis*process.siPixelClusters*process.siPixelRecHits) process.siStripLocalReco = cms.Sequence(process.siStripDigis*process.siStripZeroSuppression*process.siStripClusters*process.siStripMatchedRecHits) diff --git a/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py b/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py index 8a3232a8e0757..927d60041eed4 100644 --- a/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py +++ b/DQM/SiPixelPhase1Config/test/pixelphase1_dqm_sourceclient-live_cfg.py @@ -205,7 +205,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Scheduling diff --git a/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py b/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py index 7f9a650a90cad..db7808573942f 100644 --- a/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py +++ b/DQM/SiPixelPhase1Config/test/pixelphase1_for_timing_scan_dqm_sourceclient-live_cfg.py @@ -205,7 +205,7 @@ #-------------------------- # Service #-------------------------- -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Scheduling diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py index 983290840276f..5a874269d03db 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Offline_cfg.py @@ -50,7 +50,7 @@ process.p = cms.Path(process.RecoForDQMCosmic*process.SiStripDQMOffRealData) -process.AdaptorConfig = cms.Service("AdaptorConfig") + #------------------------- # Input Events diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py index 4185948ae5082..73fb735d85121 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_RealData_Online_cfg.py @@ -137,7 +137,7 @@ process.SiStripClients ) -process.AdaptorConfig = cms.Service("AdaptorConfig") + #------------------------- # Input Events diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py index 81b23a5d4fe6c..bc8544c90590f 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Offline_cfg.py @@ -57,7 +57,7 @@ process.outP = cms.OutputModule("AsciiOutputModule") process.ep = cms.EndPath(process.outP) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('/store/relval/2008/7/21/RelVal-RelValQCD_Pt_80_120-1216579576-STARTUP_V4-2nd/RelValQCD_Pt_80_120/GEN-SIM-DIGI-RAW-HLTDEBUG-RECO/CMSSW_2_1_0_pre9-RelVal-1216579576-STARTUP_V4-2nd-unmerged/0000/0A81C8A7-6E57-DD11-8B07-00161757BF42.root', diff --git a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py index 38ffbf2497dbb..b2790810f3973 100644 --- a/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py +++ b/DQM/SiStripMonitorClient/test/SiStripDQM_SimData_Online_cfg.py @@ -57,7 +57,7 @@ process.outP = cms.OutputModule("AsciiOutputModule") process.ep = cms.EndPath(process.outP) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('/store/relval/2008/7/21/RelVal-RelValQCD_Pt_80_120-1216579576-STARTUP_V4-2nd/RelValQCD_Pt_80_120/GEN-SIM-DIGI-RAW-HLTDEBUG-RECO/CMSSW_2_1_0_pre9-RelVal-1216579576-STARTUP_V4-2nd-unmerged/0000/0A81C8A7-6E57-DD11-8B07-00161757BF42.root', diff --git a/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py b/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py index 38f555db64b02..10fef89485b29 100644 --- a/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py +++ b/DQM/SiStripMonitorCluster/test/MonitorCluster_RealData_cfg.py @@ -100,7 +100,7 @@ process.outP = cms.OutputModule("AsciiOutputModule") -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.RecoForDQM = cms.Sequence(process.siPixelDigis*process.siPixelClusters*process.siStripDigis*process.gtDigis*process.siStripZeroSuppression*process.siStripClusters) process.p = cms.Path( diff --git a/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py b/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py index 4a38af32dfe1c..08650f35f4c68 100644 --- a/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py +++ b/DQM/SiStripMonitorCluster/test/MonitorCluster_SimData_cfg.py @@ -78,7 +78,7 @@ ## process.outP = cms.OutputModule("AsciiOutputModule") -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.RecoForDQM = cms.Sequence(process.siStripDigis*process.siStripZeroSuppression*process.siStripClusters) process.p = cms.Path(process.RecoForDQM*process.SiStripMonitorCluster) diff --git a/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py b/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py index be26c50e4e686..6db1b90bc6419 100644 --- a/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py +++ b/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_RealData_cfg.py @@ -95,7 +95,7 @@ process.SiStripMonitorDigi.TProfGlobalNShots.globalswitchon = True process.outP = cms.OutputModule("AsciiOutputModule") -process.AdaptorConfig = cms.Service("AdaptorConfig") + #-------------------------- # Sequences diff --git a/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_SimData_cfg.py b/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_SimData_cfg.py index d3020f0d7caad..49033acbddb36 100644 --- a/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_SimData_cfg.py +++ b/DQM/SiStripMonitorDigi/test/SiStripMonitorDigi_SimData_cfg.py @@ -53,7 +53,7 @@ process.outP = cms.OutputModule("AsciiOutputModule") -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('/store/relval/2008/7/21/RelVal-RelValQCD_Pt_80_120-1216579576-STARTUP_V4-2nd/RelValQCD_Pt_80_120/GEN-SIM-DIGI-RAW-HLTDEBUG-RECO/CMSSW_2_1_0_pre9-RelVal-1216579576-STARTUP_V4-2nd-unmerged/0000/0A81C8A7-6E57-DD11-8B07-00161757BF42.root', diff --git a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py index 05ac0735f9388..97bcbbb1c9f62 100644 --- a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py +++ b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimCosmics_cfg.py @@ -75,7 +75,7 @@ process.printout = cms.OutputModule("AsciiOutputModule") process.ep = cms.EndPath(process.printout) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.source = cms.Source( # Underground cosmics CRUZET diff --git a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py index b18893ae22975..9d2b9c9d207ed 100644 --- a/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py +++ b/DQM/SiStripMonitorTrack/test/SiStripMonitorTrack_SimData_cfg.py @@ -48,7 +48,7 @@ process.printout = cms.OutputModule("AsciiOutputModule") process.ep = cms.EndPath(process.printout) -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.source = cms.Source( "PoolSource", diff --git a/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py b/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py index 2c3c98d5eadc5..26b6681603f9c 100644 --- a/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py +++ b/DQM/TrackingMonitor/test/TrackEfficiencyMonitor_RealData_cfg.py @@ -52,7 +52,7 @@ process.outP = cms.OutputModule("AsciiOutputModule") -process.AdaptorConfig = cms.Service("AdaptorConfig") + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('/store/data/Commissioning08/Cosmics/RECO/v1/000/069/276/D6D1312C-6BAA-DD11-972B-000423D94494.root', diff --git a/FWCore/Framework/src/defaultCmsRunServices.cc b/FWCore/Framework/src/defaultCmsRunServices.cc index a26b9e8f16d29..d6ae817b35ea8 100644 --- a/FWCore/Framework/src/defaultCmsRunServices.cc +++ b/FWCore/Framework/src/defaultCmsRunServices.cc @@ -20,7 +20,7 @@ namespace edm { std::vector returnValue = {"MessageLogger", "InitRootHandlers", "UnixSignalService", - "AdaptorConfig", + "TFileAdaptor", "SiteLocalConfigService", "StatisticsSenderService", "ResourceInformationService", diff --git a/FWCore/MessageService/python/test/Services_cff.py b/FWCore/MessageService/python/test/Services_cff.py index b3ff355a5eacb..750e4f2fb4952 100644 --- a/FWCore/MessageService/python/test/Services_cff.py +++ b/FWCore/MessageService/python/test/Services_cff.py @@ -2,8 +2,8 @@ from FWCore.Services.InitRootHandlers_cfi import * -# Tell AdaptorConfig to suppress the statistics summary. We aren't actually using +# Tell TFileAdaptor to suppress the statistics summary. We aren't actually using # that service and it's summary interferes with the MessageLogger summary. -AdaptorConfig = cms.Service("AdaptorConfig", +TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/FWStorage/Services/src/SiteLocalConfigService.cc b/FWStorage/Services/src/SiteLocalConfigService.cc index bad177b7018aa..fb812835ee40f 100644 --- a/FWStorage/Services/src/SiteLocalConfigService.cc +++ b/FWStorage/Services/src/SiteLocalConfigService.cc @@ -546,11 +546,11 @@ namespace edm { desc.addOptionalUntracked("overrideSourceCacheTempDir"); desc.addOptionalUntracked("overrideSourceCacheMinFree"); desc.addOptionalUntracked("overrideSourceCacheHintDir") - ->setComment("Set cache hint. See AdaptorConfig plugin for valid values."); + ->setComment("Set cache hint. See TFileAdaptor plugin for valid values."); desc.addOptionalUntracked("overrideSourceCloneCacheHintDir") ->setComment("Provide an alternate cache hint for fast cloning."); desc.addOptionalUntracked("overrideSourceReadHint") - ->setComment("Set read hint. See AdaptorConfig plugin for valid values."); + ->setComment("Set read hint. See TFileAdaptor plugin for valid values."); desc.addOptionalUntracked >("overrideSourceNativeProtocols"); desc.addOptionalUntracked("overrideSourceTTreeCacheSize"); desc.addOptionalUntracked("overrideSourceTimeout"); diff --git a/FWStorage/StorageFactory/README.md b/FWStorage/StorageFactory/README.md index 3349142d57a86..35dfa1a9b2ea4 100644 --- a/FWStorage/StorageFactory/README.md +++ b/FWStorage/StorageFactory/README.md @@ -77,7 +77,7 @@ Inherits from `TFile` but uses `edm::storage::Storage` instances when doing the ### `TFileAdaptor` -`TFileAdaptor` is a cmsRun Service (with a plugin name of `AdaptorConfig`, see [FWStorage/TFileAdaptor/README.md](../../FWStorage/TFileAdaptor/README.md)). It explicitly registers the use of `TStorageFactoryFile` with ROOT's `TFile::Open` system. The parameters passed to `TFileAdaptor` are relayed to `edm::storage::StorageFactory` to setup the defaults for the job. +`TFileAdaptor` is a cmsRun Service (with a plugin name of `TFileAdaptor`, see [FWStorage/TFileAdaptor/README.md](../../FWStorage/TFileAdaptor/README.md)). It explicitly registers the use of `TStorageFactoryFile` with ROOT's `TFile::Open` system. The parameters passed to `TFileAdaptor` are relayed to `edm::storage::StorageFactory` to setup the defaults for the job. ### `CondorStatusService` Sends condor _Chirp_ messages periodically from cmsRun. These include the most recent aggregated `edm::storage::StorageAccount` information for all protocols being used except for the `"tstoragefile"` protocol. diff --git a/FWStorage/StorageFactory/scripts/edmStorageTrace.py b/FWStorage/StorageFactory/scripts/edmStorageTrace.py index 36b1233490674..a6d17816fceb0 100755 --- a/FWStorage/StorageFactory/scripts/edmStorageTrace.py +++ b/FWStorage/StorageFactory/scripts/edmStorageTrace.py @@ -524,9 +524,9 @@ def test(): #################### def printHelp(): return """The storage traces can be obtained by adding StorageTracerProxy to -the storage proxies of the AdaptorConfig Service, for example as +the storage proxies of the TFileAdaptor Service, for example as ---- -process.add_(cms.Service("AdaptorConfig", +process.add_(cms.Service("TFileAdaptor", storageProxies = cms.untracked.VPSet( cms.PSet(type = cms.untracked.string("StorageTracerProxy")) )) diff --git a/FWStorage/StorageFactory/test/test_storageproxy_test_cfg.py b/FWStorage/StorageFactory/test/test_storageproxy_test_cfg.py index 565cda0e4fc8f..32c430fc0f4a4 100644 --- a/FWStorage/StorageFactory/test/test_storageproxy_test_cfg.py +++ b/FWStorage/StorageFactory/test/test_storageproxy_test_cfg.py @@ -16,7 +16,7 @@ process.out = cms.OutputModule("PoolOutputModule", fileName = cms.untracked.string("output.root")) -adaptor = cms.Service("AdaptorConfig", storageProxies = cms.untracked.VPSet()) +adaptor = cms.Service("TFileAdaptor", storageProxies = cms.untracked.VPSet()) if args.latencyRead: adaptor.storageProxies.append(cms.PSet( type = cms.untracked.string("StorageAddLatencyProxy"), diff --git a/FWStorage/TFileAdaptor/plugins/module.cc b/FWStorage/TFileAdaptor/plugins/module.cc index c83af27df9aa3..366deebd50f3f 100644 --- a/FWStorage/TFileAdaptor/plugins/module.cc +++ b/FWStorage/TFileAdaptor/plugins/module.cc @@ -1,6 +1,4 @@ #include "FWStorage/TFileAdaptor/src/TFileAdaptor.h" #include "FWCore/ServiceRegistry/interface/ServiceMaker.h" -typedef TFileAdaptor AdaptorConfig; - -DEFINE_FWK_SERVICE(AdaptorConfig); +DEFINE_FWK_SERVICE(TFileAdaptor); diff --git a/FWStorage/TFileAdaptor/src/TFileAdaptor.cc b/FWStorage/TFileAdaptor/src/TFileAdaptor.cc index bd65a64f1ba93..6506f420e9789 100644 --- a/FWStorage/TFileAdaptor/src/TFileAdaptor.cc +++ b/FWStorage/TFileAdaptor/src/TFileAdaptor.cc @@ -247,9 +247,9 @@ void TFileAdaptor::fillDescriptions(edm::ConfigurationDescriptions& descriptions "Only after this wrapping are the LocalCacheFile (lazy-download) and statistics accounting ('stats' " "parameter) proxies applied."); - descriptions.add("AdaptorConfig", desc); + descriptions.add("TFileAdaptor", desc); descriptions.setComment( - "AdaptorConfig Service is used to configure the TFileAdaptor. If enabled, the TFileAdaptor registers " + "TFileAdaptor Service is used to configure the TFileAdaptor. If enabled, the TFileAdaptor registers " "TStorageFactoryFile as a handler for various protocols. The StorageFactory facility provides custom storage " "access implementations for these protocols, as well as statistics accounting."); } diff --git a/FWStorage/TFileAdaptor/test/test_AdaptorConfig.C b/FWStorage/TFileAdaptor/test/test_AdaptorConfig.C deleted file mode 100644 index 328a8232ebe0f..0000000000000 --- a/FWStorage/TFileAdaptor/test/test_AdaptorConfig.C +++ /dev/null @@ -1,8 +0,0 @@ -void test_AdaptorConfig(const char* fname) { - gSystem->Load("pluginIOPoolTFileAdaptor"); - TFileAdaptorUI aui; - gROOT->GetPluginManager()->Print(); - TFile* p = TFile::Open(fname); - p->Map(); - aui.stats(); -} diff --git a/FWStorage/XrdAdaptor/README.md b/FWStorage/XrdAdaptor/README.md index 0d00be3f1b271..26a636d5da696 100644 --- a/FWStorage/XrdAdaptor/README.md +++ b/FWStorage/XrdAdaptor/README.md @@ -17,7 +17,7 @@ process.add_(cms.Service("SiteLocalConfigService", # Add e.g. 10-millisecond latency to singular and vector reads # If the job reads local files via TFile::Open() in addition to PoolSource, # you want to exclude those from the latency addition -process.add_(cms.Service("AdaptorConfig", +process.add_(cms.Service("TFileAdaptor", storageProxies = cms.untracked.VPSet( cms.PSet( type = cms.untracked.string("StorageAddLatencyProxy"), diff --git a/IOPool/Common/test/FastMergeTestRL_cfg.py b/IOPool/Common/test/FastMergeTestRL_cfg.py index 1aa42f36bb452..2bbbd400f0f67 100644 --- a/IOPool/Common/test/FastMergeTestRL_cfg.py +++ b/IOPool/Common/test/FastMergeTestRL_cfg.py @@ -11,7 +11,7 @@ disableJobReportOutput = cms.untracked.bool(True) ) -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/FastMergeTestR_cfg.py b/IOPool/Common/test/FastMergeTestR_cfg.py index 4e5c45125dd7d..e62b89a5c8312 100644 --- a/IOPool/Common/test/FastMergeTestR_cfg.py +++ b/IOPool/Common/test/FastMergeTestR_cfg.py @@ -11,7 +11,7 @@ disableJobReportOutput = cms.untracked.bool(True) ) -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/FastMergeTest_ancestor2_cfg.py b/IOPool/Common/test/FastMergeTest_ancestor2_cfg.py index 9e3159d6573cc..b0abb9945bbb3 100644 --- a/IOPool/Common/test/FastMergeTest_ancestor2_cfg.py +++ b/IOPool/Common/test/FastMergeTest_ancestor2_cfg.py @@ -7,7 +7,7 @@ process = cms.Process("TESTMERGE") process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/FastMergeTest_ancestor_cfg.py b/IOPool/Common/test/FastMergeTest_ancestor_cfg.py index e0fedecc4ef5c..df6b00492419a 100644 --- a/IOPool/Common/test/FastMergeTest_ancestor_cfg.py +++ b/IOPool/Common/test/FastMergeTest_ancestor_cfg.py @@ -7,7 +7,7 @@ process = cms.Process("TESTMERGE") process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/FastMergeTest_cfg.py b/IOPool/Common/test/FastMergeTest_cfg.py index c8414d12b1290..84e4972cb9350 100644 --- a/IOPool/Common/test/FastMergeTest_cfg.py +++ b/IOPool/Common/test/FastMergeTest_cfg.py @@ -11,7 +11,7 @@ disableJobReportOutput = cms.untracked.bool(True) ) -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/FastMergeTest_x_cfg.py b/IOPool/Common/test/FastMergeTest_x_cfg.py index 41c708ad4b883..8326270c0fe53 100644 --- a/IOPool/Common/test/FastMergeTest_x_cfg.py +++ b/IOPool/Common/test/FastMergeTest_x_cfg.py @@ -11,7 +11,7 @@ disableJobReportOutput = cms.untracked.bool(True) ) -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/FastMergeTest_x_second_cfg.py b/IOPool/Common/test/FastMergeTest_x_second_cfg.py index 25eec73ba0354..703eaa62f76b6 100644 --- a/IOPool/Common/test/FastMergeTest_x_second_cfg.py +++ b/IOPool/Common/test/FastMergeTest_x_second_cfg.py @@ -7,7 +7,7 @@ process = cms.Process("TESTMERGE") process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -process.AdaptorConfig = cms.Service("AdaptorConfig", +process.TFileAdaptor = cms.Service("TFileAdaptor", stats = cms.untracked.bool(False) ) diff --git a/IOPool/Common/test/ReadFastMergeTestOutput_cfg.py b/IOPool/Common/test/ReadFastMergeTestOutput_cfg.py index 205ee1ecb5809..1fcee39ef2103 100644 --- a/IOPool/Common/test/ReadFastMergeTestOutput_cfg.py +++ b/IOPool/Common/test/ReadFastMergeTestOutput_cfg.py @@ -3,8 +3,8 @@ process = cms.Process("READTESTMERGE") process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -from FWStorage.TFileAdaptor.modules import AdaptorConfig -process.add_(AdaptorConfig(stats = False)) +from FWStorage.TFileAdaptor.modules import TFileAdaptor +process.add_(TFileAdaptor(stats = False)) process.maxEvents.input = -1 diff --git a/IOPool/Input/test/test_complex_before_3_8_0_cfg.py b/IOPool/Input/test/test_complex_before_3_8_0_cfg.py index 1f46e4524d750..9d3e13b6f8464 100644 --- a/IOPool/Input/test/test_complex_before_3_8_0_cfg.py +++ b/IOPool/Input/test/test_complex_before_3_8_0_cfg.py @@ -4,8 +4,8 @@ process = cms.Process("READMERGE") process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -from FWStorage.TFileAdaptor.modules import AdaptorConfig -process.add_(AdaptorConfig(stats = False)) +from FWStorage.TFileAdaptor.modules import TFileAdaptor +process.add_(TFileAdaptor(stats = False)) process.maxEvents.input = -1 diff --git a/IOPool/Input/test/test_complex_old_formats_cfg.py b/IOPool/Input/test/test_complex_old_formats_cfg.py index ebed5d061f75d..322e758344ce7 100644 --- a/IOPool/Input/test/test_complex_old_formats_cfg.py +++ b/IOPool/Input/test/test_complex_old_formats_cfg.py @@ -4,8 +4,8 @@ process = cms.Process("READMERGE") process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -from FWStorage.TFileAdaptor.modules import AdaptorConfig -process.add_(AdaptorConfig(stats = False)) +from FWStorage.TFileAdaptor.modules import TFileAdaptor +process.add_(TFileAdaptor(stats = False)) process.maxEvents.input = -1 diff --git a/IOPool/Input/test/test_reduced_ProcessHistory_cfg.py b/IOPool/Input/test/test_reduced_ProcessHistory_cfg.py index 5fd17f86acdb3..4b33aeb64e962 100644 --- a/IOPool/Input/test/test_reduced_ProcessHistory_cfg.py +++ b/IOPool/Input/test/test_reduced_ProcessHistory_cfg.py @@ -7,8 +7,8 @@ process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -from FWStorage.TFileAdaptor.modules import AdaptorConfig -process.add_(AdaptorConfig(stats = False)) +from FWStorage.TFileAdaptor.modules import TFileAdaptor +process.add_(TFileAdaptor(stats = False)) process.maxEvents.input = -1 diff --git a/IOPool/Input/test/test_reduced_ProcessHistory_dup_cfg.py b/IOPool/Input/test/test_reduced_ProcessHistory_dup_cfg.py index c6877398924f7..1118913d671f5 100644 --- a/IOPool/Input/test/test_reduced_ProcessHistory_dup_cfg.py +++ b/IOPool/Input/test/test_reduced_ProcessHistory_dup_cfg.py @@ -9,8 +9,8 @@ process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -from FWStorage.TFileAdaptor.modules import AdaptorConfig -process.add_(AdaptorConfig(stats = False)) +from FWStorage.TFileAdaptor.modules import TFileAdaptor +process.add_(TFileAdaptor(stats = False)) process.maxEvents.input = -1 diff --git a/IOPool/Input/test/test_reduced_ProcessHistory_end_cfg.py b/IOPool/Input/test/test_reduced_ProcessHistory_end_cfg.py index d1272fb9d5091..62b6566cd0933 100644 --- a/IOPool/Input/test/test_reduced_ProcessHistory_end_cfg.py +++ b/IOPool/Input/test/test_reduced_ProcessHistory_end_cfg.py @@ -12,8 +12,8 @@ process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") -from FWStorage.TFileAdaptor.modules import AdaptorConfig -process.add_(AdaptorConfig(stats = False)) +from FWStorage.TFileAdaptor.modules import TFileAdaptor +process.add_(TFileAdaptor(stats = False)) process.maxEvents.input = -1 diff --git a/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_175.cfg b/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_175.cfg deleted file mode 100644 index 9f094611cdd08..0000000000000 --- a/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_175.cfg +++ /dev/null @@ -1,241 +0,0 @@ -process DIGIRECO = { - - untracked PSet options = { - untracked bool wantSummary = true - untracked bool makeTriggerResults = true - } - - untracked PSet configurationMetadata = { - untracked string version = "$Revision: 1.2 $" - untracked string name = "$Source: /cvs_server/repositories/CMSSW/CMSSW/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_175.cfg,v $" - untracked string annotation = "Digitization and Reconstruction for Cosmic Muons at TIF" - } - - - # initialize MessageLogger - ######## MessageLogger ######## - service = MessageLogger { - untracked vstring destinations = { "cout", "cerr"} - untracked vstring categories = {"FwkJob","FwkReport","Root_NoDictionary"} - untracked vstring suppressInfo = {"trackingtruthprod", "siStripDigis","siStripClusters","siStripClusters325","siStripMatchedRecHits", -"CtfSpecialSeedGenerator","combinatorialcosmicseedfinderTIF","roadSearchCloudsTIF","trackinfoRSTIF","trackinfoCTFTIF","trackinfoCosmicTIF"} - untracked PSet cout = {untracked string threshold = "INFO" } - untracked PSet cerr = { untracked string threshold = "ERROR" } - } - -untracked PSet maxEvents = {untracked int32 input = 1000} - - service = RandomNumberGeneratorService - { - untracked uint32 sourceSeed = 2387 - PSet moduleSeeds = - { - untracked uint32 mix = 333 - untracked uint32 siStripDigis = 1167 - } - } - -service = AdaptorConfig {} - - source = PoolSource { - untracked vstring fileNames = { -'file:26083E4E-FBC0-DC11-A1D6-0030487724CE.root', -'file:8EADA9B9-FDC0-DC11-A4AB-001636685026.root' -##'/store/mc/2007/12/18/CSA07-TIFCosmicMuon_ConfC-3711/0000/26083E4E-FBC0-DC11-A1D6-0030487724CE.root', -##'/store/mc/2007/12/18/CSA07-TIFCosmicMuon_ConfC-3711/0000/8EADA9B9-FDC0-DC11-A4AB-001636685026.root' - } - } - - - # Mixing Module - include "SimGeneral/MixingModule/data/mixNoPU.cfi" - - # - # Strip calib - # - include "CalibTracker/Configuration/data/SiStrip_FakeGain.cff" - -# Deconvolution Mode Noise parameters (Default is Peak) - include "CalibTracker/Configuration/data/SiStrip_FakeNoise.cff" - replace SiStripNoiseFakeESSource.NoiseStripLengthSlope = 38.8 - replace SiStripNoiseFakeESSource.NoiseStripLengthQuote = 414. - - include "CalibTracker/Configuration/data/SiStrip_FakePedestals.cff" - - include "CalibTracker/Configuration/data/SiStrip_FakeLorentzAngle.cff" - ## FAKE SiStripQuality - include "CalibTracker/SiStripESProducers/data/SiStripQualityFakeESSource.cfi" - - ## CABLING - es_source = PoolDBESSource{ - VPSet toGet = { - {string record = "SiStripFedCablingRcd" string tag = "SiStripCabling_TIF_run_10848_for_MC_prod"} - } -## string connect= "frontier://FrontierDev/CMS_COND_STRIP" - string connect= "frontier://Frontier/CMS_COND_TIF_17X_STRIP" - string timetype = "runnumber" - untracked string BlobStreamerName = "TBufferBlobStreamingService" - PSet DBParameters= { - untracked string autenthicationPath = " " - untracked int32 messageLevel=4 - } - } - es_module sistripconn = SiStripConnectivity{} - - include "SimGeneral/HepPDTESSource/data/pythiapdt.cfi" - - #DIGITIZATION - #use default one for now and replace for TIF - include "SimTracker/SiStripDigitizer/data/SiStripDigi.cfi" -###change the CC!!! -### replace siStripDigis.CouplingCostantPeak = {0.86,0.07} -###3% CC - replace siStripDigis.CouplingCostantPeak = {0.94,0.03} - replace siStripDigis.APVpeakmode = true -###NEEDED for CABLE MAP - replace siStripDigis.TrackerConfigurationFromDB = true - - # ZeroSuppression - include "RecoLocalTracker/SiStripZeroSuppression/data/SiStripZeroSuppression.cfi" -##I think I need this for MC - replace siStripZeroSuppression.UseCalibDataFromDB = false - replace siStripZeroSuppression.RawDigiProducersList = { - { string RawDigiProducer = "siStripDigis" string RawDigiLabel = "VirginRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ProcessedRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ScopeMode" } - } - - #CLUSTER - include "RecoLocalTracker/SiStripClusterizer/data/SiStripClusterizer_SimData.cfi" - replace siStripClusters.ElectronPerAdc = 250.0 - replace siStripClusters.ChannelThreshold = 2.0 - replace siStripClusters.SeedThreshold = 3.0 - replace siStripClusters.ClusterThreshold = 5.0 - replace siStripClusters.UseCalibDataFromDB = false - - # SiStripClusterInfoProducer - include "AnalysisAlgos/SiStripClusterInfoProducer/data/SiStripClusterInfoProducer.cfi" - replace siStripClusterInfo.DigiProducer = "siStripDigis" - replace siStripClusterInfo.DigiLabel = "\0" - replace siStripClusterInfo.RawDigiProducersList = { - { string RawDigiProducer = "siStripDigis" string RawDigiLabel = "VirginRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ProcessedRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ScopeMode" } - } - - - ## GENERAL TRACKING - include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitMatcher.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitConverter.cfi" - - - ## MAGNETIC FIELD - replace UniformMagneticFieldESProducer.ZFieldInTesla = 0.0 - es_prefer magfield = XMLIdealGeometryESSource {} - - - ## STRIP/PIXEL CPE - include "RecoLocalTracker/SiStripRecHitConverter/data/StripCPEfromTrackAngle.cfi" - include "RecoLocalTracker/SiPixelRecHits/data/PixelCPEParmError.cfi" - - - ## COSMIC TRACK FINDER - include "RecoTracker/SpecialSeedGenerators/data/CosmicSeedTIF.cff" - module cosmictrackfinderTIF = cosmictrackfinder from "RecoTracker/SingleTrackPattern/data/CosmicTrackFinder.cfi" - replace cosmictrackfinderTIF.cosmicSeeds = cosmicseedfinderTIF - replace cosmictrackfinderTIF.Chi2Cut = 30. - - - ## CTF - include "RecoTracker/SpecialSeedGenerators/data/CombinatorialSeedGeneratorForCosmicsTIF.cff" - - #-> Replacement for "RecoTracker/CkfPattern/data/CkfTrackCandidatesTIF.cff"" - include "TrackingTools/TrackFitters/data/KFTrajectoryFitterESProducer.cfi" - include "TrackingTools/TrackFitters/data/KFTrajectorySmootherESProducer.cfi" - include "TrackingTools/TrackFitters/data/KFFittingSmootherESProducer.cfi" - module ckfTrackCandidatesTIF = ckfTrackCandidates from "RecoTracker/CkfPattern/data/CkfTrackCandidates.cfi" - replace ckfTrackCandidatesTIF.NavigationPSet.ComponentName = "CosmicNavigationSchool" - replace ckfTrackCandidatesTIF.TrajectoryBuilder = "GroupedCkfTrajectoryBuilderTIF" - replace ckfTrackCandidatesTIF.SeedProducer = "combinatorialcosmicseedfinderTIF" - - #-> Replacement for "RecoTracker/CkfPattern/data/GroupedCkfTrajectoryBuilderESProducerTIF.cff" - include "MagneticField/Engine/data/uniformMagneticField.cfi" - include "Geometry/CMSCommonData/data/cmsIdealGeometryXML.cfi" - include "Geometry/TrackerGeometryBuilder/data/trackerGeometry.cfi" - include "Geometry/TrackerNumberingBuilder/data/trackerNumberingGeometry.cfi" - include "RecoTracker/GeometryESProducer/data/TrackerRecoGeometryESProducer.cfi" - include "TrackingTools/KalmanUpdators/data/KFUpdatorESProducer.cfi" - include "TrackingTools/KalmanUpdators/data/Chi2MeasurementEstimatorESProducer.cfi" - include "TrackingTools/MaterialEffects/data/MaterialPropagator.cfi" - include "TrackingTools/MaterialEffects/data/OppositeMaterialPropagator.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/StripCPE.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/StripCPEfromTrackAngle.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitMatcher.cfi" - include "RecoLocalTracker/SiPixelRecHits/data/PixelCPEParmError.cfi" - include "RecoTracker/TransientTrackingRecHit/data/TransientTrackingRecHitBuilder.cfi" - - es_module CTF_TIF_MeasurementTracker = MeasurementTracker from "RecoTracker/MeasurementDet/data/MeasurementTrackerESProducer.cfi" - replace CTF_TIF_MeasurementTracker.ComponentName = "CTF_TIF" - replace CTF_TIF_MeasurementTracker.pixelClusterProducer = "" - replace CTF_TIF_MeasurementTracker.DebugStripModuleQualityDB = false # dump out info om module status - replace CTF_TIF_MeasurementTracker.DebugStripAPVFiberQualityDB = false # dump out info om module status - replace CTF_TIF_MeasurementTracker.DebugStripStripQualityDB = false # dump out info om module status - - es_module GroupedCkfTrajectoryBuilderTIF = GroupedCkfTrajectoryBuilder from "RecoTracker/CkfPattern/data/GroupedCkfTrajectoryBuilderESProducer.cfi" - replace GroupedCkfTrajectoryBuilderTIF.MeasurementTrackerName = "CTF_TIF" - replace GroupedCkfTrajectoryBuilderTIF.ComponentName = "GroupedCkfTrajectoryBuilderTIF" - replace GroupedCkfTrajectoryBuilderTIF.ptCut = 0.01 - replace GroupedCkfTrajectoryBuilderTIF.minimumNumberOfHits = 4 - replace GroupedCkfTrajectoryBuilderTIF.minNrOfHitsForRebuild = 2 - - include "RecoTracker/TrackProducer/data/CTFFinalFitWithMaterialTIF.cff" - - - ## ROAD SEARCH - include "RecoTracker/RoadSearchSeedFinder/data/RoadSearchSeedsTIF.cff" - include "RecoTracker/RoadSearchCloudMaker/data/RoadSearchCloudsTIF.cff" - include "RecoTracker/RoadSearchTrackCandidateMaker/data/RoadSearchTrackCandidatesTIF.cff" - include "RecoTracker/TrackProducer/data/RSFinalFitWithMaterialTIF.cff" - - - ## TRACK INFO - include "AnalysisAlgos/TrackInfoProducer/data/TrackInfoProducerTIF.cff" - - - ## TRACK COLLECTION MERGER - include "RecoTracker/FinalTrackSelectors/data/ctfrsTIFTrackListMerger.cfi" - - - # Tracking Truth - include "SimGeneral/TrackingAnalysis/data/trackingParticles.cfi" - replace trackingtruthprod.HepMCDataLabels = {"source"} - - ## OUTPUT MODULE -module out = PoolOutputModule { - untracked string fileName = "out_TIF_digireco_175_OffProd.root" - untracked PSet dataset = {untracked string dataTier = "GEN-SIM-DIGI-RECO"} - untracked vstring outputCommands = { - "keep *" - } -} - - - ## SEQUENCE - ##SiStripDigis = for data; siStripDigis = for MC -sequence digitization = {siStripDigis,siStripZeroSuppression} -sequence clusterization = {siStripClusters,siStripClusterInfo} -sequence local_reco = {digitization, clusterization, siStripMatchedRecHits} - -sequence ckftracksTIF = {combinatorialcosmicseedfinderTIF, ckfTrackCandidatesTIF,ctfWithMaterialTracksTIF} -sequence rstracksTIF = {roadSearchSeedsTIF, roadSearchCloudsTIF, rsTrackCandidatesTIF, rsWithMaterialTracksTIF} -sequence cosmictracksTIF = {cosmicseedfinderTIF, cosmictrackfinderTIF} - -sequence tracksTIF = {cosmictracksTIF, ckftracksTIF, rstracksTIF, trackinfoTIF} - -path p = {mix, trackingtruthprod, local_reco, tracksTIF, ctfrsTIFTrackListMerger} - - -endpath outpath = { out } - -} - diff --git a/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_177.cfg b/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_177.cfg deleted file mode 100644 index 9f031824e3f3d..0000000000000 --- a/SimTracker/TrackerFilters/test/TIFCosmicMuon_digireco_177.cfg +++ /dev/null @@ -1,238 +0,0 @@ -process DIGIRECO = { - - untracked PSet options = { - untracked bool wantSummary = true - untracked bool makeTriggerResults = true - } - - untracked PSet configurationMetadata = { - untracked string version = "$Revision:$" - untracked string name = "$Source:$" - untracked string annotation = "Digitization and Reconstruction for Cosmic Muons at TIF in 1_7_7" - } - - - # initialize MessageLogger - ######## MessageLogger ######## - service = MessageLogger { - untracked vstring destinations = { "cout", "cerr"} - untracked vstring categories = {"FwkJob","FwkReport","Root_NoDictionary"} - untracked vstring suppressInfo = {"trackingtruthprod", "siStripDigis","siStripClusters","siStripClusters325","siStripMatchedRecHits", -"CtfSpecialSeedGenerator","combinatorialcosmicseedfinderTIF","roadSearchCloudsTIF","trackinfoRSTIF","trackinfoCTFTIF","trackinfoCosmicTIF"} - untracked PSet cout = {untracked string threshold = "INFO" } - untracked PSet cerr = { untracked string threshold = "ERROR" } - } - -untracked PSet maxEvents = {untracked int32 input = 1000} - - service = RandomNumberGeneratorService - { - untracked uint32 sourceSeed = 2387 - PSet moduleSeeds = - { - untracked uint32 mix = 333 - untracked uint32 siStripDigis = 1167 - } - } - -service = AdaptorConfig {} - - source = PoolSource { - untracked vstring fileNames = { -'/store/mc/2008/4/3/CSA07-TIFCosmicMuon_ConfC_TkOnly-4218/0002/08DE0EB2-0A0B-DD11-9838-00145E5520E7.root' - } - } - - - # Mixing Module - include "SimGeneral/MixingModule/data/mixNoPU.cfi" - - # - # Strip calib - # - include "CalibTracker/Configuration/data/SiStrip_FakeGain.cff" - -# Deconvolution Mode Noise parameters (Default is Peak) - include "CalibTracker/Configuration/data/SiStrip_FakeNoise.cff" - replace SiStripNoiseFakeESSource.NoiseStripLengthSlope = 38.8 - replace SiStripNoiseFakeESSource.NoiseStripLengthQuote = 414. - - include "CalibTracker/Configuration/data/SiStrip_FakePedestals.cff" - - include "CalibTracker/Configuration/data/SiStrip_FakeLorentzAngle.cff" - ## FAKE SiStripQuality - include "CalibTracker/SiStripESProducers/data/SiStripQualityFakeESSource.cfi" - - ## CABLING - es_source = PoolDBESSource{ - VPSet toGet = { - {string record = "SiStripFedCablingRcd" string tag = "SiStripCabling_TIF_run_10848_for_MC_prod"} - } -## string connect= "frontier://FrontierDev/CMS_COND_STRIP" - string connect= "frontier://Frontier/CMS_COND_TIF_17X_STRIP" - string timetype = "runnumber" - untracked string BlobStreamerName = "TBufferBlobStreamingService" - PSet DBParameters= { - untracked string autenthicationPath = " " - untracked int32 messageLevel=4 - } - } - es_module sistripconn = SiStripConnectivity{} - - include "SimGeneral/HepPDTESSource/data/pythiapdt.cfi" - - #DIGITIZATION - #use default one for now and replace for TIF - include "SimTracker/SiStripDigitizer/data/SiStripDigi.cfi" -###change the CC!!! -### replace siStripDigis.CouplingCostantPeak = {0.86,0.07} -###3% CC - replace siStripDigis.CouplingCostantPeak = {0.94,0.03} - replace siStripDigis.APVpeakmode = true -###NEEDED for CABLE MAP - replace siStripDigis.TrackerConfigurationFromDB = true - - # ZeroSuppression - include "RecoLocalTracker/SiStripZeroSuppression/data/SiStripZeroSuppression.cfi" -##I think I need this for MC - replace siStripZeroSuppression.UseCalibDataFromDB = false - replace siStripZeroSuppression.RawDigiProducersList = { - { string RawDigiProducer = "siStripDigis" string RawDigiLabel = "VirginRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ProcessedRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ScopeMode" } - } - - #CLUSTER - include "RecoLocalTracker/SiStripClusterizer/data/SiStripClusterizer_SimData.cfi" - replace siStripClusters.ElectronPerAdc = 250.0 - replace siStripClusters.ChannelThreshold = 2.0 - replace siStripClusters.SeedThreshold = 3.0 - replace siStripClusters.ClusterThreshold = 5.0 - replace siStripClusters.UseCalibDataFromDB = false - - # SiStripClusterInfoProducer - include "AnalysisAlgos/SiStripClusterInfoProducer/data/SiStripClusterInfoProducer.cfi" - replace siStripClusterInfo.DigiProducer = "siStripDigis" - replace siStripClusterInfo.DigiLabel = "\0" - replace siStripClusterInfo.RawDigiProducersList = { - { string RawDigiProducer = "siStripDigis" string RawDigiLabel = "VirginRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ProcessedRaw" } - ,{ string RawDigiProducer = "siStripDigis" string RawDigiLabel = "ScopeMode" } - } - - - ## GENERAL TRACKING - include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitMatcher.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitConverter.cfi" - - - ## MAGNETIC FIELD - replace UniformMagneticFieldESProducer.ZFieldInTesla = 0.0 - es_prefer magfield = XMLIdealGeometryESSource {} - - - ## STRIP/PIXEL CPE - include "RecoLocalTracker/SiStripRecHitConverter/data/StripCPEfromTrackAngle.cfi" - include "RecoLocalTracker/SiPixelRecHits/data/PixelCPEParmError.cfi" - - - ## COSMIC TRACK FINDER - include "RecoTracker/SpecialSeedGenerators/data/CosmicSeedTIF.cff" - module cosmictrackfinderTIF = cosmictrackfinder from "RecoTracker/SingleTrackPattern/data/CosmicTrackFinder.cfi" - replace cosmictrackfinderTIF.cosmicSeeds = cosmicseedfinderTIF - replace cosmictrackfinderTIF.Chi2Cut = 30. - - - ## CTF - include "RecoTracker/SpecialSeedGenerators/data/CombinatorialSeedGeneratorForCosmicsTIF.cff" - - #-> Replacement for "RecoTracker/CkfPattern/data/CkfTrackCandidatesTIF.cff"" - include "TrackingTools/TrackFitters/data/KFTrajectoryFitterESProducer.cfi" - include "TrackingTools/TrackFitters/data/KFTrajectorySmootherESProducer.cfi" - include "TrackingTools/TrackFitters/data/KFFittingSmootherESProducer.cfi" - module ckfTrackCandidatesTIF = ckfTrackCandidates from "RecoTracker/CkfPattern/data/CkfTrackCandidates.cfi" - replace ckfTrackCandidatesTIF.NavigationPSet.ComponentName = "CosmicNavigationSchool" - replace ckfTrackCandidatesTIF.TrajectoryBuilder = "GroupedCkfTrajectoryBuilderTIF" - replace ckfTrackCandidatesTIF.SeedProducer = "combinatorialcosmicseedfinderTIF" - - #-> Replacement for "RecoTracker/CkfPattern/data/GroupedCkfTrajectoryBuilderESProducerTIF.cff" - include "MagneticField/Engine/data/uniformMagneticField.cfi" - include "Geometry/CMSCommonData/data/cmsIdealGeometryXML.cfi" - include "Geometry/TrackerGeometryBuilder/data/trackerGeometry.cfi" - include "Geometry/TrackerNumberingBuilder/data/trackerNumberingGeometry.cfi" - include "RecoTracker/GeometryESProducer/data/TrackerRecoGeometryESProducer.cfi" - include "TrackingTools/KalmanUpdators/data/KFUpdatorESProducer.cfi" - include "TrackingTools/KalmanUpdators/data/Chi2MeasurementEstimatorESProducer.cfi" - include "TrackingTools/MaterialEffects/data/MaterialPropagator.cfi" - include "TrackingTools/MaterialEffects/data/OppositeMaterialPropagator.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/StripCPE.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/StripCPEfromTrackAngle.cfi" - include "RecoLocalTracker/SiStripRecHitConverter/data/SiStripRecHitMatcher.cfi" - include "RecoLocalTracker/SiPixelRecHits/data/PixelCPEParmError.cfi" - include "RecoTracker/TransientTrackingRecHit/data/TransientTrackingRecHitBuilder.cfi" - - es_module CTF_TIF_MeasurementTracker = MeasurementTracker from "RecoTracker/MeasurementDet/data/MeasurementTrackerESProducer.cfi" - replace CTF_TIF_MeasurementTracker.ComponentName = "CTF_TIF" - replace CTF_TIF_MeasurementTracker.pixelClusterProducer = "" - replace CTF_TIF_MeasurementTracker.DebugStripModuleQualityDB = false # dump out info om module status - replace CTF_TIF_MeasurementTracker.DebugStripAPVFiberQualityDB = false # dump out info om module status - replace CTF_TIF_MeasurementTracker.DebugStripStripQualityDB = false # dump out info om module status - - es_module GroupedCkfTrajectoryBuilderTIF = GroupedCkfTrajectoryBuilder from "RecoTracker/CkfPattern/data/GroupedCkfTrajectoryBuilderESProducer.cfi" - replace GroupedCkfTrajectoryBuilderTIF.MeasurementTrackerName = "CTF_TIF" - replace GroupedCkfTrajectoryBuilderTIF.ComponentName = "GroupedCkfTrajectoryBuilderTIF" - replace GroupedCkfTrajectoryBuilderTIF.ptCut = 0.01 - replace GroupedCkfTrajectoryBuilderTIF.minimumNumberOfHits = 4 - replace GroupedCkfTrajectoryBuilderTIF.minNrOfHitsForRebuild = 2 - - include "RecoTracker/TrackProducer/data/CTFFinalFitWithMaterialTIF.cff" - - - ## ROAD SEARCH - include "RecoTracker/RoadSearchSeedFinder/data/RoadSearchSeedsTIF.cff" - include "RecoTracker/RoadSearchCloudMaker/data/RoadSearchCloudsTIF.cff" - include "RecoTracker/RoadSearchTrackCandidateMaker/data/RoadSearchTrackCandidatesTIF.cff" - include "RecoTracker/TrackProducer/data/RSFinalFitWithMaterialTIF.cff" - - - ## TRACK INFO - include "AnalysisAlgos/TrackInfoProducer/data/TrackInfoProducerTIF.cff" - - - ## TRACK COLLECTION MERGER - include "RecoTracker/FinalTrackSelectors/data/ctfrsTIFTrackListMerger.cfi" - - - # Tracking Truth - include "SimGeneral/TrackingAnalysis/data/trackingParticles.cfi" - replace trackingtruthprod.HepMCDataLabels = {"source"} - - ## OUTPUT MODULE -module out = PoolOutputModule { - untracked string fileName = "CosmicMuonTIF_digireco_177_TrackerOnly.root" - untracked PSet dataset = {untracked string dataTier = "GEN-SIM-DIGI-RECO"} - untracked vstring outputCommands = { - "keep *" - } -} - - - ## SEQUENCE - ##SiStripDigis = for data; siStripDigis = for MC -sequence digitization = {siStripDigis,siStripZeroSuppression} -sequence clusterization = {siStripClusters,siStripClusterInfo} -sequence local_reco = {digitization, clusterization, siStripMatchedRecHits} - -sequence ckftracksTIF = {combinatorialcosmicseedfinderTIF, ckfTrackCandidatesTIF,ctfWithMaterialTracksTIF} -sequence rstracksTIF = {roadSearchSeedsTIF, roadSearchCloudsTIF, rsTrackCandidatesTIF, rsWithMaterialTracksTIF} -sequence cosmictracksTIF = {cosmicseedfinderTIF, cosmictrackfinderTIF} - -sequence tracksTIF = {cosmictracksTIF, ckftracksTIF, rstracksTIF, trackinfoTIF} - -path p = {mix, trackingtruthprod, local_reco, tracksTIF, ctfrsTIFTrackListMerger} - - -endpath outpath = { out } - -} -