From eb0725aed718adbec8a7fb62c26ce16ad4a2d827 Mon Sep 17 00:00:00 2001 From: Christopher Jones Date: Tue, 17 Nov 2020 16:23:27 -0600 Subject: [PATCH] Update MessageLogger_cfi to new syntax Updated all configuration files which were dependent upon the old syntax. --- .../test/SkimProducer/skimProducer_cfg.py | 4 +- .../test/apeTreeCreateDefault_cfg.py | 4 +- .../cfgTemplate/apeEstimatorSummary_cfg.py | 2 +- .../test/cfgTemplate/apeEstimator_cfg.py | 14 +-- .../test/testApeestimatorSummary_cfg.py | 4 +- .../test/testApeestimator_cfg.py | 14 +-- .../data/AlCaHLTBitMon_cfg_template_py | 2 +- .../test/TrackerAPForPCL/alignment_mille.py | 11 ++- .../test/runTwoBodyDecayTest.py | 1 - .../test/testTkLasBeamFitter_cfg.py | 4 +- .../test/alignment_cfg.py | 11 ++- .../test/alignment_forGeomComp_cfg.py | 9 +- .../test/alignment_survey_cfg.py | 11 ++- .../test/trackerTree_cfg.py | 2 +- .../TkAlAllInOneTool/configTemplates.py | 3 +- .../test/GeometryCentering_cfg.py | 1 - .../test/PVValidation_TEMPL_cfg.py | 1 - .../test/PVValidation_T_cfg.py | 1 - .../test/PrimaryVertexResolution_cfg.py | 2 +- .../test/PrimaryVertexResolution_templ_cfg.py | 2 +- .../test/dqmOfflinevalidator_cfg.py | 4 +- .../test/eopTreeWriter_cfg.py | 2 +- .../OfflineValidation/test/inspectData_cfg.py | 2 +- .../test/offlinevalidator_cfg.py | 4 +- .../OfflineValidation/test/test_all_cfg.py | 13 +-- .../alignment_forGeomComp_cfg_TEMPLATE.py | 11 ++- .../test/trackerTreeGenerator_cfg.py | 2 +- .../test/castor_localrun_pedestals_cfg.py | 3 +- .../DTCalibration/python/dtDQMClient_cfg.py | 6 +- .../python/dtT0WireCalibration_cfg.py | 4 +- CalibMuon/DTCalibration/python/dtTPDQM_cfg.py | 4 +- .../python/dtTTrigValidSummary_cfg.py | 4 +- .../python/messageLoggerDebug_cff.py | 2 - ...elFEDChannelCollectionMapTestReader_cfg.py | 9 +- .../step3_SiPixelStatusAlCaRecoProducer.py | 4 +- .../SiStripChannelGain/test/PCL/step3_ALCA.py | 5 +- .../test/testSSTGain_MultiRun_ALCAHARVEST.py | 7 +- .../test/testSSTGain_PCL_FromRECO_cfg.py | 7 +- .../test/testProduceCalibrationTree_cfg.py | 1 - .../test/TkVoltageMapCreator_cfg.py | 4 +- .../test/SiStripCalibLorentzAngle.py | 4 +- .../test/SiStripLAProfileBooker.py | 4 +- .../test/job_scripts/template.py | 4 +- .../test/test_SiStripQualityStatistics_cfg.py | 7 +- .../test/alcaSkimming.py | 4 - .../test/AlCaIsoTrackFilterProducer_cfg.py | 4 +- .../test/python/gammaJetAnalysis_cfg.py | 2 +- .../python/gammaJetAnalysis_data2012_cfg.py | 2 +- ...ammaJetAnalysis_data2012_noGJetProd_cfg.py | 2 +- .../python/gammaJetAnalysis_noGJetProd_cfg.py | 2 +- .../test/python/hcalHBHEMuonHighEta_cfg.py | 4 +- .../test/python/hcalHBHEMuon_cfg.py | 4 +- .../python/isoTrackAlCaRecoAnalysis_cfg.py | 4 +- .../test/python/isoTrackRecoAnalysis_cfg.py | 4 +- .../test/python/isoTrackStudy_cfg.py | 4 +- .../test/python/recAnalyzerHF_cfg.py | 4 +- .../test/proto_runIsolatedTracksHcal_cfg.py | 4 +- .../proto_runIsolatedTracksNxNData_cfg.py | 4 +- .../test/Alca_BeamFit_Workflow.py | 6 +- .../test/Alca_BeamSpot_Harvester.py | 6 +- CaloOnlineTools/HcalOnlineDb/test/template.py | 2 +- ...tFlag_AlCaRecoTriggerBitsRcd_create_cfg.py | 4 +- ...entFlag_AlCaRecoTriggerBitsRcd_read_cfg.py | 4 +- ...tFlag_AlCaRecoTriggerBitsRcd_update_cfg.py | 4 +- .../test/genericTriggerEventFlagTest_cfg.py | 2 +- .../test/AlignPCLThresholdsReader_cfg.py | 9 +- .../test/AlignPCLThresholdsWriter_cfg.py | 9 +- ...PixelFEDChannelContainerFromQuality_cfg.py | 8 +- ...adFEDChannelSimulationSanityChecker_cfg.py | 12 +-- ...hannelContainerFromQualityConverter_cfg.py | 9 +- ...iPixelFEDChannelContainerTestReader_cfg.py | 9 +- ...elFEDChannelContainerWriteFromASCII_cfg.py | 9 +- ...PixelQualityProbabilitiesTestReader_cfg.py | 9 +- ...PixelQualityProbabilitiesTestWriter_cfg.py | 10 ++- ...lQualityProbabilitiesWriteFromASCII_cfg.py | 9 +- .../test/BeamSpotOnlineHLTRcdReader_cfg.py | 3 +- .../test/BeamSpotOnlineLegacyRcdReader_cfg.py | 3 +- .../BeamSpot/test/BeamSpotRcdRead_cfg.py | 1 - .../AlCaRecoTriggerBitsRcdRead_TEMPL_cfg.py | 2 +- .../test/AlCaRecoTriggerBitsRcdRead_cfg.py | 2 +- .../AlCaRecoTriggerBitsRcdUpdate_TEMPL_cfg.py | 2 +- .../test/AlCaRecoTriggerBitsRcdUpdate_cfg.py | 2 +- .../test/L1ConfigWriteIOVDummy_cfg.py | 2 +- .../test/L1ConfigWriteIOVOnline_cfg.py | 2 +- .../test/L1ConfigWritePayloadCondDB_cfg.py | 2 +- .../test/L1ConfigWritePayloadDummy_cfg.py | 2 +- .../test/L1ConfigWritePayloadOnline_cfg.py | 2 +- .../test/L1ConfigWriteRSIOVOnline_cfg.py | 2 +- .../test/L1ConfigWriteRSOnline_cfg.py | 2 +- .../test/L1ConfigWriteRSPayloadOnline_cfg.py | 2 +- .../test/L1ConfigWriteSingleIOV_cfg.py | 2 +- .../test/L1ConfigWriteSinglePayload_cfg.py | 2 +- .../test/L1GtRunSettingsViewer_cfg.py | 2 +- CondTools/L1Trigger/test/init_cfg.py | 2 +- .../L1Trigger/test/l1o2otestanalyzer_cfg.py | 2 +- CondTools/L1Trigger/test/validate-l1Key.py | 5 +- .../test/L1ConfigWriteIOVDummyExt_cfg.py | 2 +- .../test/L1ConfigWriteIOVOnlineExt_cfg.py | 2 +- .../test/L1ConfigWritePayloadCondDBExt_cfg.py | 2 +- .../test/L1ConfigWritePayloadDummyExt_cfg.py | 2 +- .../test/L1ConfigWritePayloadOnlineExt_cfg.py | 2 +- .../test/L1ConfigWriteRSIOVOnlineExt_cfg.py | 2 +- .../test/L1ConfigWriteRSOnlineExt_cfg.py | 2 +- .../L1ConfigWriteRSPayloadOnlineExt_cfg.py | 2 +- .../test/L1ConfigWriteSingleIOVExt_cfg.py | 2 +- .../test/L1ConfigWriteSinglePayloadExt_cfg.py | 2 +- CondTools/L1TriggerExt/test/init_cfg.py | 2 +- .../test/l1o2otestanalyzer_cfg.py | 2 +- ...RPCConeDefinitionWriteSinglePayload_cfg.py | 2 +- .../test/L1RPCConfigWriteSinglePayload_cfg.py | 2 +- .../test/RPCCPPFLinkMapPopConAnalyzer_cfg.py | 3 +- .../test/RPCDCCLinkMapPopConAnalyzer_cfg.py | 3 +- .../test/RPCLBLinkMapPopConAnalyzer_cfg.py | 3 +- .../test/RPCOMTFLinkMapPopConAnalyzer_cfg.py | 3 +- .../RPCTwinMuxLinkMapPopConAnalyzer_cfg.py | 3 +- ...hase2OuterTrackerLorentzAngleWriter_cfg.py | 9 +- .../test/SiPixelDynamicInefficiencyDB_cfg.py | 4 +- .../test/SiPixelGainCalibScaler_cfg.py | 7 +- .../test/SiPixelInclusiveBuilder_cfg.py | 4 +- .../SiPixel/test/SiPixelLorentzAngleDB_cfg.py | 4 +- CondTools/SiPixel/test/SiPixelVCalDB_cfg.py | 4 +- .../test/SiStripApvGainRescaler_cfg.py | 7 +- ...StripChannelGainFromDBMiscalibrator_cfg.py | 7 +- .../SiStripNoiseFromDBMiscalibrator_cfg.py | 7 +- .../reco_application_tbsim_DetSim-Digi_cfg.py | 22 +---- .../SiStripTools/python/MessageLogger_cff.py | 4 +- .../python/filtertest/MessageLogger_cff.py | 24 +++-- .../test/BigEventsDebugger_cfg.py | 4 +- .../test/ByMultiplicityFilterTest_cfg.py | 4 +- .../test/MultiplicityMonitor_cfg.py | 4 +- .../test/MultiplicityProducerTest_cfg.py | 4 +- ...ultiplicityProducerTest_pixelphase1_cfg.py | 4 +- .../SiStripTools/test/OOTmultiplicity_cfg.py | 6 +- .../test/OccupancyPlotsTest_cfg.py | 12 +-- .../test/OccupancyPlotsTest_phase2_cfg.py | 10 +-- .../OccupancyPlotsTest_pixelphase1_cfg.py | 10 +-- .../test/OccupancyPlotsTest_vtxpos_cfg.py | 4 +- .../test/TIDTECInnerRingInvestigator_cfg.py | 4 +- .../apvcyclephaseproducer_test_GR09_cfg.py | 4 +- .../test/apvcyclephaseproducer_test_db_cfg.py | 4 +- .../apvcyclephaseproducer_test_dbfile_cfg.py | 4 +- ...vcyclephaseproducer_test_fakesource_cfg.py | 4 +- .../test/apvphaseproducertest_cfg.py | 4 +- .../SiStripTools/test/apvshotanalyzer_cfg.py | 4 +- DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py | 4 +- .../test/commonmodeanalyzer_cfg.py | 4 +- .../SiStripTools/test/cosmicstracks_cfg.py | 4 +- .../test/eventwithhistoryfiltertest_cfg.py | 4 +- .../SiStripTools/test/manyfederrors_cfg.py | 4 +- .../overlapproblem_EndCapsOTPhase2_cfg.py | 9 +- .../SiStripTools/test/seedmultiplicity_cfg.py | 4 +- .../test/seedmultiplicity_highmult_cfg.py | 4 +- .../test/seedmultiplicity_test_cfg.py | 4 +- .../SiStripTools/test/ssqhistorytest_cfg.py | 4 +- .../test/ssqhistorytest_fakesource_cfg.py | 4 +- .../test/trackerdpganalysis_cfg.py | 4 +- DPGAnalysis/Skims/python/BeamSplash_cfg.py | 4 +- DPGAnalysis/Skims/python/ECALActivity_cfg.py | 4 +- DPGAnalysis/Skims/python/bsc_activity_cfg.py | 4 +- DPGAnalysis/Skims/python/bscnobeamhalo_cfg.py | 4 +- ..._HI_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- ...44X_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- ...rds_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- ...amspotproblem_dqm_sourceclient-live_cfg.py | 2 +- ...rds_Test_beam_dqm_sourceclient-live_cfg.py | 2 +- DQM/BeamMonitor/test/Alca_BeamMonitor_DQM.py | 6 +- .../test/Alca_BeamMonitor_HARVESTING.py | 6 +- DQM/BeamMonitor/test/Alca_BeamMonitor_file.py | 6 +- .../test/HeavyIonBeamMonitor_cfg.py | 2 +- .../test/Online_BeamMonitor_file.py | 6 +- .../test/hlt_dqm_sourceclient-file_cfg.py | 4 +- DQM/HLTEvF/test/hlt_muon_dqm-file_cfg.py | 4 +- .../test/l1t_dqm_sourceclient-file_cfg.py | 16 ++-- .../test/PFJet_topDQM_production_cfg.py | 6 +- DQM/Physics/test/topDQM_cfg.py | 4 +- DQM/Physics/test/topDQM_production_PU_cfg.py | 8 +- DQM/Physics/test/topDQM_production_cfg.py | 6 +- DQM/Physics/test/topDQM_production_miniAOD.py | 6 +- ...CaRecoTriggerBits_SiStripDQM_create_cfg.py | 4 +- ...AlCaRecoTriggerBits_SiStripDQM_read_cfg.py | 4 +- .../test/l1scalers_dqm_file_cfg.py | 4 +- DQM/TrigXMonitor/test/scal_dqm-file_cfg.py | 4 +- .../Hcal/test/hcalCollapseAnalyzer_cfg.py | 4 +- DQMOffline/Trigger/test/FSQtestDQM.py | 2 +- .../Trigger/test/HLTTauOfflineDQMTest_cfg.py | 2 +- .../Trigger/test/triggerSequenceTest_cfg.py | 4 +- .../OfflineDBLoader/test/dumpGeom_cfg.py | 4 +- .../test/SimpleSystematicsAnalyzer.py | 3 +- .../CSCRawToDigi/test/testCSCDigi2Raw_cfg.py | 5 +- EventFilter/CSCTFRawToDigi/test/analyzer.py | 2 +- EventFilter/CSCTFRawToDigi/test/data.py | 2 +- .../test/testCSCTFRawToDigi_cfg.py | 2 +- .../GEMRawToDigi/test/unpackData-GEM.py | 5 +- .../test/L1GtEvmPacker_cfg.py | 4 +- .../test/L1GtEvmUnpacker_cfg.py | 21 ++--- .../test/L1GtPacker_cfg.py | 4 +- .../test/L1GtRecord_cfg.py | 11 ++- .../test/L1GtTriggerMenuLite_cfg.py | 9 +- .../test/L1GtUnpacker_cfg.py | 21 ++--- .../utils/unpackBuffers-CaloStage2.py | 6 +- .../utils/unpackData-CaloStage1.py | 6 +- .../utils/unpackData-CaloStage2.py | 6 +- .../test/AssociationMapReadTest_cfg.py | 4 +- .../test/AssociationMapTest_cfg.py | 4 +- FWCore/Integration/test/RefTest_cfg.py | 4 +- FWCore/Integration/test/TransRefTest_cfg.py | 4 +- FWCore/Integration/test/ViewTest_cfg.py | 4 +- FWCore/Integration/test/parentlessTest_cfg.py | 4 +- .../MessageLogger_ReleaseValidation_cfi.py | 82 ++++++++++++----- .../python/MessageLogger_cfi.py | 87 +++++++++++++------ FWCore/MessageService/test/t1_cfg.py | 2 +- FWCore/MessageService/test/t2_cfg.py | 2 +- FWCore/MessageService/test/u32_cfg.py | 7 +- FWCore/MessageService/test/u9_cfg.py | 9 +- .../bin/edmTracerLogToSimpleConfig.py | 4 +- .../test/CastorTowerProducerTest_cfg.py | 2 +- .../MaterialEffects/test/NITemplate_cfg.py | 4 +- .../test/testMaterialEffects_cfg.py | 3 +- .../test/testNuclearInteractions_cfg.py | 5 +- .../test/beamspot/BeamSpotCalculator_cfg.py | 3 +- .../Tracking/test/testGeneralTracks_cfg.py | 3 +- .../test/SingleElectronAnalyzer-full_cfg.py | 3 +- .../test/SingleElectronAnalyzer_cfg.py | 3 +- FastSimulation/Validation/test/checkTiming.sh | 3 +- .../Validation/test/runJetPlotFast_cfg.py | 3 +- .../test/Py6EvtGenFilter_cfg.py | 4 +- .../test/Py6GenFilter_Photos_cfg.py | 4 +- .../test/Py6GenFilter_W2TauNu_Tauola_cfg.py | 4 +- .../test/Py8GenFilter_Onia_EvtGen_cfg.py | 4 +- .../test/Py8GenFilter_Photos_cfg.py | 4 +- .../test/Py8GenFilter_W2TauNu_Tauola_cfg.py | 4 +- .../test/Py8_Z2tautau_tauolacxx_cfg.py | 4 +- .../ExternalDecays/test/TauSpinnerWTest.py | 4 +- .../ExternalDecays/test/TauSpinnerZTest.py | 4 +- .../GenExtensions/test/EDDE_cfg.py | 4 +- .../GenFilters/test/comphep_singletop_Py8.py | 4 +- .../GenFilters/test/test_EMJetHeep_cfg.py | 4 +- .../GenFilters/test/test_EMJetMB_cfg.py | 4 +- .../GenFilters/test/test_isotrack_cfg.py | 2 +- .../test/AlpgenSource_Py6Had_cfg.py | 4 +- .../test/Py6EvtGenFilter_cfg.py | 4 +- .../test/Py6GenFilter_CSAMode_cfg.py | 4 +- ...enFilter_ElectronProtonInitialState_cfg.py | 4 +- .../test/Py6GenFilter_EvtGenTest_cfg.py | 4 +- .../test/Py6GenFilter_PDG_convert_cfg.py | 4 +- .../test/Py6GenFilter_Photos_cfg.py | 4 +- .../test/Py6GenFilter_SLHA_cfg.py | 4 +- .../test/Py6GenFilter_Ztautau_Tauola_cfg.py | 4 +- .../Pythia6Interface/test/Py6GenFilter_cfg.py | 4 +- .../test/Py6GenFilter_gluino_cfg.py | 4 +- .../test/Py6GenFilter_stophadrons_cfg.py | 4 +- .../test/Py6HadFilter_RestoreRNDM_cfg.py | 4 +- .../Pythia6Interface/test/Py6HadFilter_cfg.py | 4 +- .../test/Py6HadFilter_mgmatching_cfg.py | 4 +- .../TauolaInterface/test/TauSpinnerWTest.py | 4 +- .../TauolaInterface/test/TauSpinnerZTest.py | 4 +- Geometry/CSCGeometry/test/cgac_cfg.py | 4 +- .../CSCGeometry/test/cgac_db_withb_cfg.py | 4 +- Geometry/CSCGeometry/test/cgacwithb_cfg.py | 4 +- Geometry/CSCGeometry/test/cgal_cfg.py | 6 +- Geometry/CSCGeometry/test/cgos_cfg.py | 4 +- Geometry/CSCGeometry/test/cgos_db_cfg.py | 4 +- Geometry/CSCGeometry/test/cgow_cfg.py | 4 +- Geometry/CSCGeometry/test/cgow_db_cfg.py | 4 +- Geometry/CSCGeometry/test/cgowung_db_cfg.py | 4 +- Geometry/CSCGeometry/test/clgi_cfg.py | 4 +- .../test/testCSCGeometryFromDB_cfg.py | 4 +- .../CSCGeometry/test/testCSCGeometry_cfg.py | 4 +- .../test/python/dumpCSCGeometryDD4hep_cfg.py | 8 +- .../test/python/dumpCSCGeometryDDD_cfg.py | 8 +- .../CaloTopology/test/testCaloTowerMap_cfg.py | 4 +- .../test/testHGCalTopology_cfg.py | 4 +- .../test/testHcalDetId2DenseTester_cfg.py | 6 +- .../test/python/dumpECDD4Hep_cfg.py | 4 +- .../test/python/dumpECDDD_cfg.py | 8 +- .../python/runEcalSimParameterDD4Hep_cfg.py | 8 +- .../test/python/runEcalSimParameterDDD_cfg.py | 6 +- .../test/runSurveyToTransforms_cfg.py | 2 +- .../test/dumpHFNoseGeometry_cfg.py | 8 +- .../test/dumpT2Geometry_cfg.py | 8 +- .../test/g4OverlapCheck_cfg.py | 8 +- .../test/testHFNoseNumbering_cfg.py | 4 +- .../test/testHFNoseParameters_cfg.py | 4 +- .../test/testTotemT2Geometry_cfg.py | 4 +- .../test/testHFNoseGeometry_cfg.py | 4 +- .../test/runGEMDetIdAnalysis_cfg.py | 4 +- .../GEMGeometry/test/testGE0Geometry_cfg.py | 21 ++--- .../GEMGeometry/test/testGEMGeometry_cfg.py | 21 ++--- .../GEMGeometry/test/testME0Geometry_cfg.py | 10 ++- .../test/python/dumpGEMGeometryDD4Hep_cfg.py | 8 +- .../test/python/dumpGEMGeometryDDD_cfg.py | 8 +- .../test/python/dumpME0GeometryDD4Hep_cfg.py | 8 +- .../test/python/dumpME0GeometryDDD_cfg.py | 8 +- .../python/validateGEMGeometryDD4Hep_cfg.py | 6 +- .../test/python/validateGEMGeometryDDD_cfg.py | 6 +- .../test/python/dumpAHcalModuleDD4Hep_cfg.py | 4 +- .../test/python/dumpAHcalModuleDDD_cfg.py | 8 +- .../dumpExtendedHGCalGeometryDD4Hep_cfg.py | 4 +- .../dumpExtendedHGCalGeometryDDD_cfg.py | 8 +- .../test/python/dumpHGCalCellDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalCellDDD_cfg.py | 8 +- .../test/python/dumpHGCalEEDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalEEDDD_cfg.py | 8 +- .../python/dumpHGCalGeometryDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalGeometryDDD_cfg.py | 8 +- .../test/python/dumpHGCalHEmixDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalHEmixDDD_cfg.py | 8 +- .../test/python/dumpHGCalHEsilDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalHEsilDDD_cfg.py | 8 +- .../python/dumpHGCalModuleAlgoDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalModuleAlgoDDD_cfg.py | 8 +- .../test/python/dumpHGCalModuleDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalModuleDDD_cfg.py | 8 +- .../dumpHGCalNoTaperEndcapDD4Hep_cfg.py | 4 +- .../python/dumpHGCalNoTaperEndcapDDD_cfg.py | 8 +- .../test/python/dumpHGCalTBGeometryDDD_cfg.py | 8 +- .../python/dumpHGCalTBModuleDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalTBModuleDDD_cfg.py | 8 +- .../python/dumpHGCalTBModuleXDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalTBModuleXDDD_cfg.py | 8 +- .../test/python/dumpHGCalWafer8DD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalWafer8DDD_cfg.py | 8 +- .../python/dumpHGCalWaferAlgoDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalWaferAlgoDDD_cfg.py | 8 +- .../test/python/dumpHGCalWaferDD4Hep_cfg.py | 4 +- .../test/python/dumpHGCalWaferDDD_cfg.py | 8 +- .../test/python/dumpTBGeometryDDD_cfg.py | 8 +- .../test/python/hgcalV11_cfg.py | 6 +- .../test/python/runTest_cfg.py | 8 +- .../test/python/testHGCGeometry_cfg.py | 4 +- .../test/python/testHGCalNumbering_cfg.py | 4 +- .../python/testHGCalParametersDD4Hep_cfg.py | 4 +- .../test/python/testHGCalParametersDDD_cfg.py | 4 +- .../python/testHGCalTBParametersDD4Hep_cfg.py | 4 +- .../python/testHGCalTBParametersDDD_cfg.py | 4 +- .../test/python/testHGCalValidHex_cfg.py | 4 +- .../test/python/testHGCalWafer_cfg.py | 4 +- .../python/runCaloCellGeometryTest_cfg.py | 6 +- .../test/python/testHGCalCorner_cfg.py | 4 +- .../test/python/testHGCalGeomLocator_cfg.py | 4 +- .../test/python/testHGCalGeometryCheck_cfg.py | 4 +- .../python/testHGCalGeometryMouseBite_cfg.py | 4 +- .../test/python/testHGCalGeometry_cfg.py | 4 +- .../test/python/testHGCalNeighbor_cfg.py | 4 +- .../test/python/testHGCalRecHitTool_cfg.py | 4 +- .../test/python/testHGCalSize_cfg.py | 4 +- .../test/python/testHGCalWaferCell_cfg.py | 4 +- .../python/testHGCalWaferInFileCheck_cfg.py | 4 +- .../python/testHGCalWaferInFileTest_cfg.py | 4 +- .../python/testHGCalWaferTypeTester_cfg.py | 4 +- .../test/python/testHGCalWafer_cfg.py | 4 +- .../test/python/dumpForwardShield_cfg.py | 8 +- .../HcalAlgo/test/python/dumpHBGeom_cfg.py | 8 +- .../test/python/dumpHEPhase0Geom_cfg.py | 8 +- .../test/python/dumpHEPhase1Geom_cfg.py | 8 +- .../HcalAlgo/test/python/dumpHFGeom_cfg.py | 8 +- .../HcalAlgo/test/python/dumpHOGeom_cfg.py | 8 +- .../HcalAlgo/test/python/dumpHcalXtal_cfg.py | 8 +- .../HcalAlgo/test/python/dumpTBCable_cfg.py | 8 +- .../HcalAlgo/test/python/dumpTBHOGeom_cfg.py | 8 +- .../HcalAlgo/test/python/dumpTestBeam_cfg.py | 8 +- .../test/python/testForwardShield_cfg.py | 4 +- .../HcalAlgo/test/python/testHBGeom_cfg.py | 4 +- .../test/python/testHEPhase0Geom_cfg.py | 4 +- .../test/python/testHEPhase1Geom_cfg.py | 4 +- .../HcalAlgo/test/python/testHFGeom_cfg.py | 4 +- .../HcalAlgo/test/python/testHOGeom_cfg.py | 4 +- .../HcalAlgo/test/python/testHcalXtal_cfg.py | 4 +- .../HcalAlgo/test/python/testTBCable_cfg.py | 4 +- .../HcalAlgo/test/python/testTBHOGeom_cfg.py | 4 +- .../HcalAlgo/test/python/testTestBeam_cfg.py | 4 +- .../python/runCaloPararemetrsAnalyzer_cfg.py | 4 +- .../python/runCaloPararemetrsTester_cfg.py | 6 +- ...runHcalParametersFromDD4HepAnalyzer_cfg.py | 6 +- .../runHcalParametersFromDDDAnalyzer_cfg.py | 4 +- .../runHcalRecNumberingDD4hepTester_cfg.py | 4 +- .../runHcalRecNumberingDDDTester_cfg.py | 4 +- .../python/runHcalScintillatorTester_cfg.py | 4 +- .../runHcalSimNumberingDD4hepTester_cfg.py | 4 +- .../runHcalSimNumberingDDDTester_cfg.py | 4 +- .../runHcalSimParametersAnalyzer_cfg.py | 4 +- .../python/runHcalSimParametersTester_cfg.py | 6 +- .../test/python/run2004_cfg.py | 18 ++-- .../python/testHcalTBParameterDD4Hep_cfg.py | 14 +-- .../test/python/testHcalTBParameterDDD_cfg.py | 14 +-- .../MuonCommonData/test/python/dumpGE0_cfg.py | 8 +- .../MuonCommonData/test/python/dumpGEM_cfg.py | 8 +- .../MuonCommonData/test/python/runME_cfg.py | 8 +- .../test/python/testDDGEMAngularAlgorithm.py | 4 +- .../test/testMuonOffsetDD4Hep_cfg.py | 4 +- .../test/testMuonOffsetDDD_cfg.py | 4 +- .../test/python/dumpRPCGeometryDD4hep_cfg.py | 8 +- .../test/python/dumpRPCGeometryDDD_cfg.py | 8 +- .../test/python/dumpTracker_cfg.py | 12 +-- .../test/python/run21Zero.py | 4 +- .../python/testTrackerModuleInfoDDD_cfg.py | 6 +- .../testTrackerParametersFromDD4hep_cfg.py | 4 +- .../test/trackerModuleNumberingDD4hep_cfg.py | 4 +- .../Configuration/python/CustomConfigs.py | 8 +- .../Configuration/test/OnLine_HLT_FULL.py | 12 +-- .../Configuration/test/OnLine_HLT_Fake.py | 12 +-- .../Configuration/test/OnLine_HLT_Fake1.py | 12 +-- .../Configuration/test/OnLine_HLT_Fake2.py | 12 +-- .../Configuration/test/OnLine_HLT_GRun.py | 12 +-- .../Configuration/test/OnLine_HLT_HIon.py | 12 +-- .../Configuration/test/OnLine_HLT_PIon.py | 12 +-- .../Configuration/test/OnLine_HLT_PRef.py | 12 +-- HLTrigger/Configuration/test/analyse_cfg.py | 22 ++--- HLTrigger/HLTanalyzers/test/HLTrigReport.py | 2 +- .../test/test_hltrigreport_base_cfg.py | 2 +- HLTrigger/HLTcore/test/getHLTPrescaleTable.py | 2 +- HLTrigger/HLTcore/test/putHLTPrescaleTable.py | 2 +- .../HLTfilters/test/HLTBeamModeFilter_cfg.py | 6 +- .../HLTfilters/test/HLTLevel1GTSeed_cfg.py | 4 +- .../Muon/test/hltMuonL1RegionalFilter_cfg.py | 2 +- HLTrigger/Timer/python/FastTimer.py | 2 +- .../special/test/testDynamicPrescaler.py | 2 +- .../B2G/test/b2gHLTDQM_production_cfg.py | 2 +- .../Common/test/hltHarvesting_cfg.py | 2 +- .../test/hltSourceHarvestCompare_cfg.py | 2 +- HLTriggerOffline/Egamma/test/testEmDQM_cfg.py | 2 +- .../Exotica/test/hltExoticaValidator_cfg.py | 8 +- .../test/heavyFlavorValidation_cfg.py | 2 +- .../Higgs/test/hltHiggsValidator_cfg.py | 5 +- .../Muon/test/hltMuonValidator_cfg.py | 5 +- .../SMP/test/hltSMPValidator_cfg.py | 5 +- .../Tau/test/runHLTTauValidation_cfg.py | 2 +- .../CUDAServices/test/testCUDAService.py | 2 +- .../MPIServices/test/testMPIService.py | 2 +- .../SonicTriton/test/tritonTest_cfg.py | 3 +- IOMC/Input/test/testWriter_cfg.py | 4 +- .../test/writeLUTsAndRegs_cfg.py | 2 +- .../test/L1GtAnalyzer_cfg.py | 19 ++-- .../test/L1GtBeamModeFilter_cfg.py | 6 +- .../test/L1GtDataEmulAnalyzer_cfg.py | 5 +- .../test/L1GtDataFromRawEmulAnalyzer_cfg.py | 5 +- .../test/L1GtEmulTrigReport_cfg.py | 21 ++--- .../test/L1GtPackUnpackAnalyzer_cfg.py | 4 +- ...L1GtPatternGenerator_overrideL1Menu_cfg.py | 17 ++-- .../L1GtTechTrigL1GtEmulTrigReport_cfg.py | 2 +- .../test/L1GtTrigReport_cfg.py | 2 +- .../test_L1EGCrystalClusterEmulator_cfg.py | 2 +- .../L1GctAnalyzer/test/gctErrorFilter_cfg.py | 2 +- .../L1GctAnalyzer/test/gctLUTGenerator_cfg.py | 2 +- .../test/gctPatternTester_cfg.py | 2 +- .../test/generatePattern-Stage2MP.py | 6 +- L1Trigger/L1TCommon/test/reEmul.py | 6 +- L1Trigger/L1TCommon/test/runL1T.py | 6 +- .../L1TGlobal/test/Raw2Digi_uGTEmulation.py | 8 +- .../test/l1tGlobalEmulation_FromDigi.py | 6 +- .../test/l1tGlobalEmulation_FromRAW.py | 6 +- L1Trigger/L1TGlobal/test/raw2l1.py | 2 +- L1Trigger/L1TGlobal/test/runGTSummary.py | 2 +- .../test/runGlobalFakeInputProducer.py | 4 +- .../unpackBuffers-CaloStage2_uGTEmulation.py | 10 +-- .../test/rpcTechnicalTriggerCosmics_cfg.py | 5 +- .../test/rpcTechnicalTriggerData_cfg.py | 5 +- .../test/rpcTechnicalTrigger_cfg.py | 5 +- .../test/L1TrackNtupleMaker_cfg.py | 4 +- .../test/tmtt_tf_analysis_cfg.py | 2 +- .../test/L1TrackNtupleMaker_cfg.py | 4 +- .../test/analyzerFakeProducer.py | 2 +- .../CSCTFConfigProducers/test/testEmulator.py | 5 +- .../test/testEmulatorFromSQLite.py | 5 +- .../test/testO2O_csctf_cfg.py | 2 +- .../test/testO2O_ptlut_cfg.py | 2 +- .../test/writeCSCTFPayload.py | 2 +- .../test/testOnlineProdMasks_cfg.py | 2 +- .../test/testOnlineProdParameters_cfg.py | 2 +- .../GMTConfigProducers/test/minitestRS_cfg.py | 2 +- .../GMTConfigProducers/test/minitest_cfg.py | 2 +- .../test/writeLUTsAndRegs_cfg.py | 2 +- .../test/test-config-print.py | 2 +- .../GctConfigProducers/test/test-o2o-print.py | 2 +- .../GctConfigProducers/test/test-o2o-rs.py | 2 +- .../test/L1GtOnlineWriteSqlTest_cfg.py | 2 +- .../test/L1GtParametersOnlineTest_cfg.py | 2 +- ...GtPrescaleFactorsAlgoTrigOnlineTest_cfg.py | 2 +- ...GtPrescaleFactorsTechTrigOnlineTest_cfg.py | 2 +- .../test/L1GtPsbSetupOnlineTest_cfg.py | 2 +- .../test/L1GtTester_cfg.py | 19 ++-- .../L1GtTriggerMaskAlgoTrigOnlineTest_cfg.py | 2 +- .../L1GtTriggerMaskTechTrigOnlineTest_cfg.py | 2 +- ...GtTriggerMaskVetoTechTrigOnlineTest_cfg.py | 2 +- .../test/L1GtTriggerMenuOnlineTest_cfg.py | 2 +- .../test/L1GtTriggerMenuTester_cfg.py | 24 ++--- .../L1ScalesProducers/test/minitest_cfg.py | 2 +- .../test/L1RCT_RunSettings.py | 2 +- .../RCTConfigProducers/test/test-tsc-o2o.py | 2 +- L1TriggerConfig/Utilities/test/dumpAll.py | 2 +- L1TriggerConfig/Utilities/test/dumpECpar.py | 2 +- .../Utilities/test/dumpL1TCaloParams.py | 2 +- .../test/dumpL1TGlobalPrescalesVetos.py | 2 +- .../Utilities/test/dumpL1TMuonBarrelParams.py | 2 +- .../Utilities/test/dumpL1TMuonEndCapParams.py | 2 +- .../Utilities/test/dumpL1TMuonGlobalParams.py | 2 +- .../test/dumpL1TMuonOverlapParams.py | 2 +- .../Utilities/test/dumpL1TUtmTriggerMenu.py | 2 +- L1TriggerConfig/Utilities/test/dumpMenu.py | 2 +- L1TriggerConfig/Utilities/test/dumpOverPar.py | 2 +- L1TriggerConfig/Utilities/test/fetchMenu.py | 2 +- .../Utilities/test/fetchMenuKeyList.py | 2 +- .../Utilities/test/updateCaloParams.py | 2 +- .../Utilities/test/uploadBmtfParams.py | 2 +- .../Utilities/test/uploadCaloParams.py | 2 +- .../Utilities/test/uploadEmtfForest.py | 2 +- .../Utilities/test/uploadEmtfParams.py | 2 +- .../Utilities/test/uploadGmtParams.py | 2 +- L1TriggerConfig/Utilities/test/viewAll.py | 2 +- .../Utilities/test/viewCaloParams.py | 2 +- L1TriggerConfig/Utilities/test/viewECpar.py | 2 +- .../Utilities/test/viewGlobalMuon.py | 2 +- L1TriggerConfig/Utilities/test/viewMenu.py | 2 +- L1TriggerConfig/Utilities/test/viewOverPar.py | 2 +- .../Utilities/test/viewPrescalesVetos.py | 2 +- L1TriggerConfig/Utilities/test/viewTKE.py | 2 +- .../Utilities/test/viewTKEonline.py | 2 +- L1TriggerConfig/Utilities/test/viewTKLE.py | 2 +- .../miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py | 1 - .../test/L1MuonMatcher/test.py | 2 +- .../test/L1MuonMatcher/testAnyBX.py | 2 +- .../test/L1MuonMatcher/testCRAFT.py | 2 +- .../debugMuonsClassByHits_cfg.py | 3 +- .../MuonMCClassifier/testClassByHitsTP_cfg.py | 5 +- .../test/testFlavorHistoryProducer.py | 2 +- .../test/testParticleTreeDrawer.py | 1 - .../JetExamples/test/printGenJetRatio.py | 2 +- .../JetExamples/test/printJetFlavour.py | 5 +- .../JetExamples/test/printJetFlavourInfo.py | 5 +- .../PatAlgos/test/corMETFromMiniAOD.py | 1 - .../private/patLayer1_fromAOD-minimal.cfg.py | 2 +- .../test/private/testPATUserDataExternal.py | 2 +- .../test/analyzePatBJetTags_cfg.py | 2 +- .../test/analyzePatBJetTracks_cfg.py | 2 +- .../test/analyzePatBJetVertex_cfg.py | 2 +- .../test/analyzePatElectron_cfg.py | 2 +- .../PatExamples/test/analyzePatTracks_cfg.py | 2 +- .../PatExamples/test/analyzePatVertex_cfg.py | 2 +- .../test/testTagProbeFitTreeAnalyzer_Zee.py | 1 - .../test/testRegionalJetTracking_cfg.py | 2 +- RecoHI/HiTracking/test/testTracking_cfg.py | 2 +- .../test/testMultipleEcalRecoLocal_cfg.py | 2 +- RecoLocalMuon/CSCRecHitD/test/run_on_raw.py | 8 +- .../CSCRecHitD/test/run_on_raw_72x.py | 6 +- .../CSCRecHitD/test/run_on_simdigi.py | 10 +-- .../CSCRecHitD/test/test_bad_channels.py | 5 +- .../CSCSegment/test/run_on_raw_700.py | 8 +- .../CSCSegment/test/run_on_raw_720p3.py | 7 +- .../CSCSegment/test/run_on_raw_74x.py | 12 +-- .../CSCSegment/test/run_on_raw_75x.py | 11 +-- .../CSCSegment/test/run_on_simdigi.py | 14 ++- .../CSCSegment/test/run_on_simdigi_74x.py | 5 +- .../CSCSegment/test/run_on_simdigi_75x.py | 5 +- .../CSCSegment/test/run_on_simdigi_df.py | 5 +- .../CSCSegment/test/run_on_simdigi_sk.py | 5 +- .../CSCSegment/test/run_on_simdigi_st.py | 5 +- .../CSCSegment/test/run_on_simdigi_tc.py | 5 +- .../test/runGEMCSCSegmentProducer_cfg.py | 12 ++- ...cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py | 8 +- .../test/runGEMSegmentProducer_cfg.py | 9 +- .../test/runME0SegmentProducer_cfg.py | 8 +- .../test/analysis/test/RunFromRAW_template.py | 4 +- .../analysis/test/Run_AlCaLumiPixels_LS.py | 4 +- .../analysis/test/Run_PixVertex_DataCert.py | 4 +- .../test/analysis/test/Run_PixVertex_Event.py | 4 +- .../test/analysis/test/Run_template.py | 4 +- .../LumiProducer/test/testLumiProd_cfg.py | 3 +- .../test/testLumiProd_cfg_dummy.py | 3 +- .../fastsimSampleWithHLT_1E31_cfg.py | 6 +- RecoMTD/DetLayers/test/mtd_cfg.py | 8 +- .../test/IntegrationTestWithHLT_cfg.py | 6 +- .../TkDetLayers/test/TkDetLayersAnalyzer.py | 2 +- .../test/readOnlineBeamSpotFromDB.py | 4 +- .../Geometry/test/writeFile_phase1_cfg.py | 4 +- .../Geometry/test/writeFile_phase2_cfg.py | 4 +- .../test/test_EBTrigPrim_cfg.py | 2 +- .../python/ecalTB2006H4_GenSimDigiReco_cfg.py | 21 +---- .../python/gensimdigi_H4EEtest_cfg.py | 23 +---- .../Calo/test/python/calostepAnalysis_cfg.py | 4 +- SimG4CMS/Calo/test/python/calostep_cfg.py | 10 +-- .../python/dd4hep_SingleMuon_Step1_cfg.py | 4 - .../test/python/ddd_SingleMuon_Step1_cfg.py | 3 - SimG4CMS/Calo/test/python/minbias_cfg.py | 4 +- .../Calo/test/python/qcdpt3000_3500_cfg.py | 4 +- SimG4CMS/Calo/test/python/run2018Step1_cfg.py | 8 +- SimG4CMS/Calo/test/python/runAPD_cfg.py | 10 +-- SimG4CMS/Calo/test/python/runDetID_cfg.py | 4 +- SimG4CMS/Calo/test/python/runEcalGeom_cfg.py | 6 +- .../Calo/test/python/runEcalSimHitDump_cfg.py | 4 +- SimG4CMS/Calo/test/python/runEcalStudy_cfg.py | 4 +- SimG4CMS/Calo/test/python/runEta13_cfg.py | 4 +- SimG4CMS/Calo/test/python/runEta2_cfg.py | 4 +- SimG4CMS/Calo/test/python/runEta7_cfg.py | 4 +- SimG4CMS/Calo/test/python/runHFNose_cfg.py | 8 +- SimG4CMS/Calo/test/python/runHGC3_cfg.py | 6 +- SimG4CMS/Calo/test/python/runHGC4_cfg.py | 10 +-- SimG4CMS/Calo/test/python/runHcalGeom_cfg.py | 6 +- SimG4CMS/Calo/test/python/runMakeGDML_cfg.py | 6 +- SimG4CMS/Calo/test/python/runMuon_cfg.py | 6 +- SimG4CMS/Calo/test/python/runScale_cfg.py | 6 +- .../Calo/test/python/runWithAPDTest_cfg.py | 6 +- SimG4CMS/Calo/test/python/runWithGun_cfg.py | 6 +- SimG4CMS/Calo/test/python/ttbar_cfg.py | 4 +- SimG4CMS/Calo/test/python/zee_cfg.py | 4 +- .../test/runSingleDREAM_cfg.py | 6 +- .../CherenkovAnalysis/test/testMuon_cfg.py | 6 +- SimG4CMS/Forward/python/test/runZdc_cfg.py | 22 +---- .../Forward/test/python/runTotemT22021_cfg.py | 10 +-- .../HGCalTestBeam/test/HGCalTBCERN170_cfg.py | 10 +-- .../test/HGCalTBCERN181Oct1_cfg.py | 12 +-- .../test/HGCalTBCERN181Oct1el100_cfg.py | 8 +- .../test/HGCalTBCERN181Oct2_cfg.py | 12 +-- .../test/HGCalTBCERN181Oct3_cfg.py | 12 +-- .../HGCalTestBeam/test/HGCalTBCERN181_cfg.py | 8 +- .../test/HGCalTBGenSimCERNMB_cfg.py | 6 +- .../HGCalTestBeam/test/dumpTBGeometry_cfg.py | 8 +- .../test/runTBAnalCERN181Oct1_cfg.py | 6 +- .../test/python/anal_tb06_noEcal_cfg.py | 3 +- .../HcalTestBeam/test/python/run2004_cfg.py | 18 ++-- .../test/python/run2006_33_cfg.py | 6 +- .../test/python/run2006_37_cfg.py | 6 +- .../test/python/run2006_77_cfg.py | 6 +- .../HcalTestBeam/test/python/run2006_cfg.py | 6 +- .../HcalTestBeam/test/python/run2007_cfg.py | 6 +- .../HcalTestBeam/test/python/run2010_cfg.py | 6 +- SimG4CMS/Muon/test/runMuonSimHitDump_cfg.py | 4 +- SimG4CMS/Muon/test/runMuon_cfg.py | 8 +- .../Application/test/GeometryProducer_cfg.py | 3 +- .../test/dd4hep_ZMM_Run3_Step1_cfg.py | 18 ++-- .../test/dd4hep_ZMM_Run3_Step2_cfg.py | 8 +- .../test/dd4hep_ZMM_Run3_Step3_cfg.py | 2 +- .../test/ddd_ZMM_Run3_Step1_cfg.py | 10 +-- .../test/ddd_ZMM_Run3_Step2_cfg.py | 6 +- .../test/ddd_ZMM_Run3_Step3_cfg.py | 2 +- .../python/G4StepStatistics.py | 19 +--- SimG4Core/PhysicsLists/test/minbias_cfg.py | 4 +- .../test/python/g4DumpGeometry_cfg.py | 3 +- .../test/python/g4OverlapCheck_cfg.py | 4 +- .../test/python/runDD4HEP_cfg.py | 6 +- .../PrintGeomInfo/test/python/runDDD_cfg.py | 6 +- .../PrintGeomInfo/test/python/runSens_cfg.py | 3 +- .../test/python/runSummary_cfg.py | 6 +- .../test/python/run_MaterialBudgeInfo_cfg.py | 3 +- .../HepPDTESSource/test/ParticleCheck.py | 19 +--- SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py | 7 +- .../CSCDigitizer/test/CSCDigitizerTest_cfg.py | 7 +- .../test/testAssociatorRecoMuon_cfg.py | 4 +- SimMuon/MCTruth/test/testCosmics42X_cfg.py | 8 +- .../test/testMuonAssociatorEDProducer_cfg.py | 7 +- SimMuon/MCTruth/test/testReader_cfg.py | 11 +-- .../test/testSeedToTrackProducer_cfg.py | 2 +- .../test/runRPCDigiProducer_cfg.py | 15 +--- .../test/TrackingMaterialAnalyser_dd4hep.py | 4 +- .../test/listGroups_dd4hep.py | 4 +- .../test/listIds_dd4hep.py | 4 +- .../test/trackingMaterialAnalyser.py | 8 +- ...ackingMaterialAnalyser_ForHFNosePhaseII.py | 8 +- ...rackingMaterialAnalyser_ForHGCalPhaseII.py | 8 +- .../trackingMaterialAnalyser_ForPhaseI.py | 8 +- .../trackingMaterialAnalyser_ForPhaseII.py | 4 +- .../trackingMaterialProducer10GeVNeutrino.py | 8 +- ...lProducer10GeVNeutrino_ForHFNosePhaseII.py | 8 +- ...alProducer10GeVNeutrino_ForHGCalPhaseII.py | 8 +- ...MaterialProducer10GeVNeutrino_ForPhaseI.py | 8 +- ...aterialProducer10GeVNeutrino_ForPhaseII.py | 4 +- .../Examples/test/analyzeTopElectron_cfg.py | 2 +- .../Examples/test/analyzeTopGenEvent_cfg.py | 2 +- .../Examples/test/analyzeTopHypotheses_cfg.py | 4 +- .../Examples/test/analyzeTopJet_cfg.py | 2 +- .../Examples/test/analyzeTopMuon_cfg.py | 2 +- .../Examples/test/analyzeTopTau_cfg.py | 2 +- .../TopEventProducers/test/pseudoTop_cfg.py | 2 +- .../TopEventProducers/test/stGenEvent_cfg.py | 2 +- .../test/ttDecaySubset_cfg.py | 2 +- .../test/ttFullHadEvtBuilder_cfg.py | 2 +- .../test/ttFullLepEvtBuilder_cfg.py | 2 +- .../test/ttSemiLepEvtBuilder_cfg.py | 6 +- .../test/ttSemiLepHitFitProducer_cfg.py | 2 +- .../test/ttFullHadKinFitProducer_cfg.py | 4 +- .../test/ttSemiLepKinFitProducer_cfg.py | 4 +- .../test/ttDecayChannelFilters_cfg.py | 4 +- .../TopTools/test/ttJetPartonMatch_cfg.py | 2 +- .../test/HarvestingGlobalValidation_RelVal.py | 2 +- ...ertLHE2HepMCReweightandValidate8TeV_cfg.py | 10 +-- .../Geometry/test/runP_Castor_Debug_cfg.py | 4 +- .../Geometry/test/runP_HCAL_Debug_cfg.py | 6 +- .../test/runP_HCAL_Debug_dd4hep_cfg.py | 6 +- Validation/Geometry/test/runP_HCAL_cfg.py | 4 +- .../test/python/protoHGCalSimWatcher_cfg.py | 6 +- .../test/python/protoSimValid_cfg.py | 4 +- .../test/python/protoValid_cfg.py | 4 +- .../test/python/runHFNoseDigiStudy_cfg.py | 6 +- .../test/python/runHFNoseRecHitStudy_cfg.py | 4 +- .../test/python/runHFNoseSimHitStudy_cfg.py | 4 +- .../test/python/runHGCGeomCheck_cfg.py | 6 +- .../test/python/runHGCHitAnalyzer_cfg.py | 4 +- .../test/python/runHGCalDigiStudy_cfg.py | 4 +- .../test/python/runHGCalRecHitStudy_cfg.py | 4 +- .../test/python/runHGCalWaferHitCheck_cfg.py | 6 +- .../test/python/runHGCalWaferStudy_cfg.py | 4 +- .../test/python/testHFNoseSimHitStudy_cfg.py | 8 +- .../test/python/testHGCalBHValid_cfg.py | 6 +- .../test/python/testHGCalSimHitStudy_cfg.py | 8 +- .../test/python/testHGCalSimWatcherV10_cfg.py | 6 +- .../test/python/testHGCalSimWatcherV11_cfg.py | 6 +- .../test/python/testHGCalSimWatcherV12_cfg.py | 6 +- .../test/python/testHGCalSimWatcherV13_cfg.py | 6 +- .../test/python/testHGCalSimWatcherV14_cfg.py | 6 +- .../test/python/testHGCalSimWatcherV8_cfg.py | 6 +- .../test/python/testHGCalSimWatcherV9_cfg.py | 6 +- Validation/HcalDigis/test/runZdc_digi_cfg.py | 23 +---- .../test/runHcalGeomCheckStep1_cfg.py | 4 +- .../test/runHcalGeomCheckStep2_cfg.py | 4 +- Validation/HcalHits/test/runZdc_cfg.py | 23 +---- Validation/HcalHits/test/runZdc_digi_cfg.py | 21 +---- .../HcalRecHits/test/runHcalDumpHits_cfg.py | 4 +- .../Performance/python/TimeMemoryG4Info.py | 20 +---- .../Performance/python/TimeMemoryJobReport.py | 2 +- .../RecoMuon/test/muonValidation_cfg.py | 4 +- .../Tools/CreateSqliteForCondDB_cfg.py | 5 +- .../test/MultiTrackValidatorGenPs_cfg.py | 2 +- .../test/allanalyzer_example_cfg.py | 4 +- .../RecoVertex/test/bspvanalyzer_cfg.py | 4 +- .../RecoVertex/test/mcverticesanalyzer_cfg.py | 4 +- .../test/mcverticessimpleanalyzer_cfg.py | 4 +- .../test/mcverticestriggerbiasanalyzer_cfg.py | 4 +- .../HarvestingGlobalValidation_Tracking.py | 2 +- 727 files changed, 1848 insertions(+), 2112 deletions(-) diff --git a/Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py b/Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py index 85d35329f2761..d83862f8d5405 100644 --- a/Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py +++ b/Alignment/APEEstimation/test/SkimProducer/skimProducer_cfg.py @@ -32,8 +32,8 @@ ## Message Logger ## process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.append('AlignmentTrackSelector') -#process.MessageLogger.categories.append('') + +# process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = -1 process.MessageLogger.cerr.AlignmentTrackSelector = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/Alignment/APEEstimation/test/apeTreeCreateDefault_cfg.py b/Alignment/APEEstimation/test/apeTreeCreateDefault_cfg.py index df1691d79dd98..160b662f372a9 100644 --- a/Alignment/APEEstimation/test/apeTreeCreateDefault_cfg.py +++ b/Alignment/APEEstimation/test/apeTreeCreateDefault_cfg.py @@ -54,8 +54,8 @@ ## Message Logger ## process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.append('DefaultAPETree') -process.MessageLogger.categories.append('SectorBuilder') + + process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = 0 process.MessageLogger.cerr.DefaultAPETree = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py b/Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py index 831b6378f2d5a..2b2f0e299a651 100644 --- a/Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py +++ b/Alignment/APEEstimation/test/cfgTemplate/apeEstimatorSummary_cfg.py @@ -35,7 +35,7 @@ ## Message Logger ## process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.append('CalculateAPE') + process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = 0 process.MessageLogger.cerr.CalculateAPE = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py b/Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py index 9439ed0afe089..5d7a1804b9d2c 100644 --- a/Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py +++ b/Alignment/APEEstimation/test/cfgTemplate/apeEstimator_cfg.py @@ -50,13 +50,13 @@ ## Message Logger ## process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.append('SectorBuilder') -process.MessageLogger.categories.append('ResidualErrorBinning') -process.MessageLogger.categories.append('HitSelector') -process.MessageLogger.categories.append('CalculateAPE') -process.MessageLogger.categories.append('ApeEstimator') -process.MessageLogger.categories.append('TrackRefitter') -process.MessageLogger.categories.append('AlignmentTrackSelector') + + + + + + + process.MessageLogger.cerr.threshold = 'WARNING' process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = -1 diff --git a/Alignment/APEEstimation/test/testApeestimatorSummary_cfg.py b/Alignment/APEEstimation/test/testApeestimatorSummary_cfg.py index 64cef1e9b615c..e90863328e682 100644 --- a/Alignment/APEEstimation/test/testApeestimatorSummary_cfg.py +++ b/Alignment/APEEstimation/test/testApeestimatorSummary_cfg.py @@ -41,8 +41,8 @@ ## Message Logger ## process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.append('CalculateAPE') -#process.MessageLogger.categories.append('ApeEstimatorSummary') + +# process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = -1 process.MessageLogger.cerr.CalculateAPE = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/Alignment/APEEstimation/test/testApeestimator_cfg.py b/Alignment/APEEstimation/test/testApeestimator_cfg.py index 7f9a029ca5958..a40b39a8a7926 100644 --- a/Alignment/APEEstimation/test/testApeestimator_cfg.py +++ b/Alignment/APEEstimation/test/testApeestimator_cfg.py @@ -40,13 +40,13 @@ ## Message Logger ## process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.append('SectorBuilder') -process.MessageLogger.categories.append('ResidualErrorBinning') -process.MessageLogger.categories.append('HitSelector') -process.MessageLogger.categories.append('CalculateAPE') -process.MessageLogger.categories.append('ApeEstimator') -#process.MessageLogger.categories.append('TrackRefitter') -process.MessageLogger.categories.append('AlignmentTrackSelector') + + + + + +# + process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = -1 # Do not use =0, else all error messages (except those listed below) are supressed process.MessageLogger.cerr.SectorBuilder = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/Alignment/CommonAlignmentProducer/data/AlCaHLTBitMon_cfg_template_py b/Alignment/CommonAlignmentProducer/data/AlCaHLTBitMon_cfg_template_py index bd1f17409c106..a28c54b5f64e8 100644 --- a/Alignment/CommonAlignmentProducer/data/AlCaHLTBitMon_cfg_template_py +++ b/Alignment/CommonAlignmentProducer/data/AlCaHLTBitMon_cfg_template_py @@ -18,7 +18,7 @@ process.load("Geometry.TrackerGeometryBuilder.trackerGeometry_cfi") process.load("Configuration.StandardSequences.FrontierConditions_GlobalTag_cff") process.GlobalTag.globaltag = '%%%GLOBALTAG%%%' -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger = cms.Service("MessageLogger", destinations = cms.untracked.vstring("%%%LOGFILE%%%"), %%%LOGFILE%%% = cms.untracked.PSet( diff --git a/Alignment/CommonAlignmentProducer/test/TrackerAPForPCL/alignment_mille.py b/Alignment/CommonAlignmentProducer/test/TrackerAPForPCL/alignment_mille.py index 71f1b8c8c0f21..3152a4355878a 100644 --- a/Alignment/CommonAlignmentProducer/test/TrackerAPForPCL/alignment_mille.py +++ b/Alignment/CommonAlignmentProducer/test/TrackerAPForPCL/alignment_mille.py @@ -14,10 +14,8 @@ # initialize MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['alignment'] -process.MessageLogger.statistics = ['alignment'] -process.MessageLogger.categories = ['Alignment'] -process.MessageLogger.alignment = cms.untracked.PSet( + +process.MessageLogger.files.alignment = cms.untracked.PSet( DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -32,11 +30,12 @@ ), Alignment = cms.untracked.PSet( limit = cms.untracked.int32(-1), - ) + ), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(True) +process.MessageLogger.cerr.enable = cms.untracked.bool(False) process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py b/Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py index 1b77fd822155a..18002c192d6ff 100644 --- a/Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py +++ b/Alignment/HIPAlignmentAlgorithm/test/runTwoBodyDecayTest.py @@ -5,7 +5,6 @@ # Messages process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 10000 process.load("Alignment.CommonAlignmentProducer.AlignmentTrackSelector_cfi") diff --git a/Alignment/LaserAlignment/test/testTkLasBeamFitter_cfg.py b/Alignment/LaserAlignment/test/testTkLasBeamFitter_cfg.py index e3cfdc23c3942..d8b7781ac18d7 100644 --- a/Alignment/LaserAlignment/test/testTkLasBeamFitter_cfg.py +++ b/Alignment/LaserAlignment/test/testTkLasBeamFitter_cfg.py @@ -6,12 +6,12 @@ ## Message Logger ## process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(100) # every 100th only # limit = cms.untracked.int32(10) # or limit to 10 printouts... )) -process.MessageLogger.statistics.append('cout') +process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) ## ## Process options diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py index 44025f23223e5..384e2b9c98f31 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py +++ b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_cfg.py @@ -10,7 +10,7 @@ # initialize MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.alignment = cms.untracked.PSet( +process.MessageLogger.files.alignment = cms.untracked.PSet( DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -27,12 +27,11 @@ Alignment = cms.untracked.PSet( limit = cms.untracked.int32(-1), reportEvery = cms.untracked.int32(1) - ) + ), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(True) -process.MessageLogger.destinations = ['alignment'] -process.MessageLogger.statistics = ['alignment'] -process.MessageLogger.categories = ['Alignment'] +process.MessageLogger.cerr.enable = cms.untracked.bool(False) + # initialize magnetic field diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_forGeomComp_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_forGeomComp_cfg.py index 5cfa3f02a8b4c..41df8f44f3ddd 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_forGeomComp_cfg.py +++ b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_forGeomComp_cfg.py @@ -14,7 +14,7 @@ # initialize MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.alignment = cms.untracked.PSet( +process.MessageLogger.files.alignment = cms.untracked.PSet( DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -31,12 +31,9 @@ Alignment = cms.untracked.PSet( limit = cms.untracked.int32(-1), reportEvery = cms.untracked.int32(1) - ) + ), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(True) -process.MessageLogger.destinations = ['alignment'] -process.MessageLogger.statistics = ['alignment'] -process.MessageLogger.categories = ['Alignment'] # initialize magnetic field diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py index bcad153ee6a8e..f550de0061086 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py +++ b/Alignment/MillePedeAlignmentAlgorithm/test/alignment_survey_cfg.py @@ -10,7 +10,7 @@ # initialize MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.alignment = cms.untracked.PSet( +process.MessageLogger.files.alignment = cms.untracked.PSet( DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -27,12 +27,11 @@ Alignment = cms.untracked.PSet( limit = cms.untracked.int32(-1), reportEvery = cms.untracked.int32(1) - ) + ), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(True) -process.MessageLogger.destinations = ['alignment'] -process.MessageLogger.statistics = ['alignment'] -process.MessageLogger.categories = ['Alignment'] +process.MessageLogger.cerr.enable = cms.untracked.bool(False) + # initialize magnetic field diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py b/Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py index cc43f9c4c8990..34cad21f599ae 100644 --- a/Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py +++ b/Alignment/MillePedeAlignmentAlgorithm/test/trackerTree_cfg.py @@ -29,7 +29,7 @@ # MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TrackerTreeGenerator') + process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = -1 process.MessageLogger.cerr.TrackerTreeGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py b/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py index 64eff2b515174..31c75cd743cb5 100644 --- a/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py +++ b/Alignment/OfflineValidation/python/TkAlAllInOneTool/configTemplates.py @@ -157,9 +157,8 @@ ) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.statistics.append('cout') +process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) """ diff --git a/Alignment/OfflineValidation/test/GeometryCentering_cfg.py b/Alignment/OfflineValidation/test/GeometryCentering_cfg.py index a541bbb8c9cbe..caa338802496d 100644 --- a/Alignment/OfflineValidation/test/GeometryCentering_cfg.py +++ b/Alignment/OfflineValidation/test/GeometryCentering_cfg.py @@ -5,7 +5,6 @@ process.load("Configuration.Geometry.GeometryDB_cff") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] ### needed to get the geometry from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py b/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py index 9f0c165281a25..55afdae9869fe 100644 --- a/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py +++ b/Alignment/OfflineValidation/test/PVValidation_TEMPL_cfg.py @@ -80,7 +80,6 @@ def customiseKinksAndBows(process): # Messages ################################################################### process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 1000 #################################################################### diff --git a/Alignment/OfflineValidation/test/PVValidation_T_cfg.py b/Alignment/OfflineValidation/test/PVValidation_T_cfg.py index 86adbd0727e8e..24ab7925009d4 100644 --- a/Alignment/OfflineValidation/test/PVValidation_T_cfg.py +++ b/Alignment/OfflineValidation/test/PVValidation_T_cfg.py @@ -75,7 +75,6 @@ def customiseKinksAndBows(process): # Messages ################################################################### process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 1000 #################################################################### diff --git a/Alignment/OfflineValidation/test/PrimaryVertexResolution_cfg.py b/Alignment/OfflineValidation/test/PrimaryVertexResolution_cfg.py index ccc675428e79f..369281f878834 100644 --- a/Alignment/OfflineValidation/test/PrimaryVertexResolution_cfg.py +++ b/Alignment/OfflineValidation/test/PrimaryVertexResolution_cfg.py @@ -59,7 +59,7 @@ def best_match(rcd): print("maxEvents : ", options.maxEvents) process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1000) # every 100th only # limit = cms.untracked.int32(10) # or limit to 10 printouts... diff --git a/Alignment/OfflineValidation/test/PrimaryVertexResolution_templ_cfg.py b/Alignment/OfflineValidation/test/PrimaryVertexResolution_templ_cfg.py index 183736a6654db..991829ad238f2 100644 --- a/Alignment/OfflineValidation/test/PrimaryVertexResolution_templ_cfg.py +++ b/Alignment/OfflineValidation/test/PrimaryVertexResolution_templ_cfg.py @@ -65,7 +65,7 @@ def best_match(rcd): print("outputFile : ", options.outputRootFile) process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1000) # every 100th only # limit = cms.untracked.int32(10) # or limit to 10 printouts... diff --git a/Alignment/OfflineValidation/test/dqmOfflinevalidator_cfg.py b/Alignment/OfflineValidation/test/dqmOfflinevalidator_cfg.py index 1b7d05c3384db..6fa9f0a6a5695 100644 --- a/Alignment/OfflineValidation/test/dqmOfflinevalidator_cfg.py +++ b/Alignment/OfflineValidation/test/dqmOfflinevalidator_cfg.py @@ -11,12 +11,12 @@ ## Message Logger ## process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(100) # every 100th only # limit = cms.untracked.int32(10) # or limit to 10 printouts... )) -process.MessageLogger.statistics.append('cout') +process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) ## diff --git a/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py b/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py index e067f965f07b2..da72b959f244a 100644 --- a/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py +++ b/Alignment/OfflineValidation/test/eopTreeWriter_cfg.py @@ -6,7 +6,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'ERROR' process.MessageLogger.cerr.FwkReport.reportEvery = 10000 -process.MessageLogger.categories.append('TrackRefitter') + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(False) ) diff --git a/Alignment/OfflineValidation/test/inspectData_cfg.py b/Alignment/OfflineValidation/test/inspectData_cfg.py index 9c6fac1ab2a84..e134ba3459e2f 100644 --- a/Alignment/OfflineValidation/test/inspectData_cfg.py +++ b/Alignment/OfflineValidation/test/inspectData_cfg.py @@ -39,7 +39,7 @@ # Message logger service ################################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1000) # every 100th only # limit = cms.untracked.int32(10) # or limit to 10 printouts... diff --git a/Alignment/OfflineValidation/test/offlinevalidator_cfg.py b/Alignment/OfflineValidation/test/offlinevalidator_cfg.py index c904eb1bbbde6..65bfa7c6ee43f 100644 --- a/Alignment/OfflineValidation/test/offlinevalidator_cfg.py +++ b/Alignment/OfflineValidation/test/offlinevalidator_cfg.py @@ -6,14 +6,14 @@ ## Message Logger #################################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1000) # every 100th only # limit = cms.untracked.int32(10) # or limit to 10 printouts... )) -process.MessageLogger.statistics.append('cout') +process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.options = cms.untracked.PSet( Rethrow = cms.untracked.vstring("ProductNotFound") # make this exception fatal # , fileMode = cms.untracked.string('FULLMERGE') # any file order (default): caches all lumi/run products (memory!) diff --git a/Alignment/OfflineValidation/test/test_all_cfg.py b/Alignment/OfflineValidation/test/test_all_cfg.py index b9578e75f02ed..8c36f249bda2b 100644 --- a/Alignment/OfflineValidation/test/test_all_cfg.py +++ b/Alignment/OfflineValidation/test/test_all_cfg.py @@ -44,11 +44,12 @@ class RefitType(Enum): # Messages ################################################################### process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("PrimaryVertexValidation") -process.MessageLogger.categories.append("SplitVertexResolution") -process.MessageLogger.categories.append("FilterOutLowPt") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -56,9 +57,9 @@ class RefitType(Enum): ), PrimaryVertexValidation = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SplitVertexResolution = cms.untracked.PSet( limit = cms.untracked.int32(-1)), - FilterOutLowPt = cms.untracked.PSet( limit = cms.untracked.int32(-1)) + FilterOutLowPt = cms.untracked.PSet( limit = cms.untracked.int32(-1)), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.statistics.append('cout') #################################################################### # Produce the Transient Track Record in the event diff --git a/Alignment/TrackerAlignment/test/alignment_forGeomComp_cfg_TEMPLATE.py b/Alignment/TrackerAlignment/test/alignment_forGeomComp_cfg_TEMPLATE.py index f1bb6dbbfcd27..4526700adf177 100644 --- a/Alignment/TrackerAlignment/test/alignment_forGeomComp_cfg_TEMPLATE.py +++ b/Alignment/TrackerAlignment/test/alignment_forGeomComp_cfg_TEMPLATE.py @@ -27,7 +27,7 @@ usedGlobalTag = process.GlobalTag.globaltag.value() process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.LOGFILE = cms.untracked.PSet( +process.MessageLogger.files.LOGFILE = cms.untracked.PSet( DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -44,12 +44,11 @@ Alignment = cms.untracked.PSet( limit = cms.untracked.int32(-1), reportEvery = cms.untracked.int32(1) - ) + ), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(True) -process.MessageLogger.destinations = ['LOGFILE'] -process.MessageLogger.statistics = ['LOGFILE'] -process.MessageLogger.categories = ['Alignment'] +process.MessageLogger.cerr.enable = cms.untracked.bool(False) + ## if alignment constants not from global tag, add this from CondCore.CondDB.CondDB_cfi import * diff --git a/Alignment/TrackerAlignment/test/trackerTreeGenerator_cfg.py b/Alignment/TrackerAlignment/test/trackerTreeGenerator_cfg.py index 43dace7ed1895..5f242ac0e8f1b 100644 --- a/Alignment/TrackerAlignment/test/trackerTreeGenerator_cfg.py +++ b/Alignment/TrackerAlignment/test/trackerTreeGenerator_cfg.py @@ -17,7 +17,7 @@ ## process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TrackerTreeGenerator') + process.MessageLogger.cerr.INFO.limit = 0 process.MessageLogger.cerr.default.limit = -1 process.MessageLogger.cerr.TrackerTreeGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1)) diff --git a/CalibCalorimetry/CastorCalib/test/castor_localrun_pedestals_cfg.py b/CalibCalorimetry/CastorCalib/test/castor_localrun_pedestals_cfg.py index 43fd64145641c..bf1ad1c0716f3 100644 --- a/CalibCalorimetry/CastorCalib/test/castor_localrun_pedestals_cfg.py +++ b/CalibCalorimetry/CastorCalib/test/castor_localrun_pedestals_cfg.py @@ -117,7 +117,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['detailedInfo.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo = dict(extension = 'txt') #process.p = cms.Path(process.dumpRaw*process.castorDigis*process.dump*process.m*process.dumpECA) process.p = cms.Path(process.castorDigis*process.castorpedestalsanalysis) diff --git a/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py b/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py index 3ad9e77effd51..e44b2d5da2808 100644 --- a/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py +++ b/CalibMuon/DTCalibration/python/dtDQMClient_cfg.py @@ -9,9 +9,9 @@ class config: pass process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('') -process.MessageLogger.destinations = cms.untracked.vstring('cerr') -process.MessageLogger.categories.append('DTDQM') -process.MessageLogger.categories.append('resolution') + + + process.MessageLogger.cerr = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), noLineBreaks = cms.untracked.bool(False), diff --git a/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py b/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py index d947fd0beca30..7b69b9160b376 100644 --- a/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py +++ b/CalibMuon/DTCalibration/python/dtT0WireCalibration_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('*') -process.MessageLogger.destinations = cms.untracked.vstring('cerr') -process.MessageLogger.categories.append('resolution') + + process.MessageLogger.cerr = cms.untracked.PSet( FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(100), diff --git a/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py b/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py index 95741876d7d9d..115965ee501bc 100644 --- a/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTPDQM_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('*') -process.MessageLogger.destinations = cms.untracked.vstring('cerr') -process.MessageLogger.categories.append('resolution') + + process.MessageLogger.cerr = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), noLineBreaks = cms.untracked.bool(False), diff --git a/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py b/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py index f9d78cc397b29..4e84f7d410a7c 100644 --- a/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py +++ b/CalibMuon/DTCalibration/python/dtTTrigValidSummary_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('') -process.MessageLogger.destinations = cms.untracked.vstring('cerr') -process.MessageLogger.categories.append('resolution') + + process.MessageLogger.cerr = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), noLineBreaks = cms.untracked.bool(False), diff --git a/CalibMuon/DTCalibration/python/messageLoggerDebug_cff.py b/CalibMuon/DTCalibration/python/messageLoggerDebug_cff.py index 058e5dc842961..0c90d870e5b5e 100644 --- a/CalibMuon/DTCalibration/python/messageLoggerDebug_cff.py +++ b/CalibMuon/DTCalibration/python/messageLoggerDebug_cff.py @@ -2,8 +2,6 @@ from FWCore.MessageService.MessageLogger_cfi import * MessageLogger.debugModules = cms.untracked.vstring('') -MessageLogger.destinations = cms.untracked.vstring('cerr') -MessageLogger.categories.append('Calibration') MessageLogger.cerr = cms.untracked.PSet( FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(100), diff --git a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader_cfg.py b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader_cfg.py index c00a534013e74..e92870982310a 100644 --- a/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader_cfg.py +++ b/CalibTracker/SiPixelESProducers/test/PixelFEDChannelCollectionMapTestReader_cfg.py @@ -6,10 +6,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelFEDChannelContainer") -process.MessageLogger.categories.append("PixelFEDChannelCollectionMapTestReader") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -18,7 +20,6 @@ SiPixelFEDChannelContainer = cms.untracked.PSet( limit = cms.untracked.int32(-1)), PixelFEDChannelCollectionMapTestReader = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty Source diff --git a/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py b/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py index 29be3ccbcca6d..90e511c58d17a 100644 --- a/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py +++ b/CalibTracker/SiPixelQuality/test/step3_SiPixelStatusAlCaRecoProducer.py @@ -7,8 +7,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.FwkReport.reportEvery = 10000 -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.options = cms.untracked.PSet( SkipEvent = cms.untracked.vstring('ProductNotFound'), wantSummary = cms.untracked.bool(True) diff --git a/CalibTracker/SiStripChannelGain/test/PCL/step3_ALCA.py b/CalibTracker/SiStripChannelGain/test/PCL/step3_ALCA.py index 4d9da4520e5a3..f0274018b76a7 100644 --- a/CalibTracker/SiStripChannelGain/test/PCL/step3_ALCA.py +++ b/CalibTracker/SiStripChannelGain/test/PCL/step3_ALCA.py @@ -53,10 +53,9 @@ # Uncomment to turn on verbosity output #process.load("FWCore.MessageLogger.MessageLogger_cfi") #process.MessageLogger.threshold = cms.untracked.string('INFO') -#process.MessageLogger.cout.threshold = cms.untracked.string('INFO') #process.MessageLogger.debugModules = cms.untracked.vstring("*") -#process.MessageLogger.destinations = cms.untracked.vstring('cout') -#process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO')) +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), enable = cms.untracked.bool(True)) #process.Tracer = cms.Service("Tracer") diff --git a/CalibTracker/SiStripChannelGain/test/testSSTGain_MultiRun_ALCAHARVEST.py b/CalibTracker/SiStripChannelGain/test/testSSTGain_MultiRun_ALCAHARVEST.py index 2a5872ab148ed..94e5b82511583 100644 --- a/CalibTracker/SiStripChannelGain/test/testSSTGain_MultiRun_ALCAHARVEST.py +++ b/CalibTracker/SiStripChannelGain/test/testSSTGain_MultiRun_ALCAHARVEST.py @@ -18,9 +18,11 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('SimGeneral.HepPDTESSource.pythiapdt_cfi') process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiStripGainsPCLHarvester") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("ERROR"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -28,7 +30,6 @@ ), SiStripGainsPCLHarvester = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.GeometryRecoDB_cff') diff --git a/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py b/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py index 2841322897055..ecf5568453faf 100644 --- a/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py +++ b/CalibTracker/SiStripChannelGain/test/testSSTGain_PCL_FromRECO_cfg.py @@ -61,17 +61,18 @@ def getFileNames_das_client(era_name): # Messages ################################################################### process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiStripGainsPCLWorker") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), + enableStatistics = cms.untracked.bool(True), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), reportEvery = cms.untracked.int32(1000) ), SiStripGainsPCLWorker = cms.untracked.PSet( limit = cms.untracked.int32(-1)), ) -process.MessageLogger.statistics.append('cout') process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.GeometryRecoDB_cff') diff --git a/CalibTracker/SiStripCommon/test/testProduceCalibrationTree_cfg.py b/CalibTracker/SiStripCommon/test/testProduceCalibrationTree_cfg.py index 328d3c4c97ec6..8391465d5a7e7 100644 --- a/CalibTracker/SiStripCommon/test/testProduceCalibrationTree_cfg.py +++ b/CalibTracker/SiStripCommon/test/testProduceCalibrationTree_cfg.py @@ -88,7 +88,6 @@ def alterTriggersForUnitTest(process): process.GlobalTag = GlobalTag(process.GlobalTag, options.conditionGT, options.conditionOverwrite) process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.destinations = ['cout', 'cerr'] if(options.unitTest): process.MessageLogger.cerr.FwkReport.reportEvery = 1 else: diff --git a/CalibTracker/SiStripDCS/test/TkVoltageMapCreator_cfg.py b/CalibTracker/SiStripDCS/test/TkVoltageMapCreator_cfg.py index 972b2199e940f..316dbfe5dd1f4 100644 --- a/CalibTracker/SiStripDCS/test/TkVoltageMapCreator_cfg.py +++ b/CalibTracker/SiStripDCS/test/TkVoltageMapCreator_cfg.py @@ -4,9 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('infos') -process.MessageLogger.infos = cms.untracked.PSet( - placeholder = cms.untracked.bool(False), +process.MessageLogger.files.infos = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/CalibTracker/SiStripLorentzAngle/test/SiStripCalibLorentzAngle.py b/CalibTracker/SiStripLorentzAngle/test/SiStripCalibLorentzAngle.py index 996928edb98eb..ce826d92bf82c 100644 --- a/CalibTracker/SiStripLorentzAngle/test/SiStripCalibLorentzAngle.py +++ b/CalibTracker/SiStripLorentzAngle/test/SiStripCalibLorentzAngle.py @@ -47,9 +47,9 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('sistripLACalib') -process.MessageLogger.destinations = cms.untracked.vstring('LACalibDebug_Calib') +process.MessageLogger.cerr.enable = False -process.MessageLogger.LACalibDebug_Calib = cms.untracked.PSet( +process.MessageLogger.files.LACalibDebug_Calib = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), noLineBreaks = cms.untracked.bool(False), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)) diff --git a/CalibTracker/SiStripLorentzAngle/test/SiStripLAProfileBooker.py b/CalibTracker/SiStripLorentzAngle/test/SiStripLAProfileBooker.py index a5c0fc344f329..7e769e678905f 100644 --- a/CalibTracker/SiStripLorentzAngle/test/SiStripLAProfileBooker.py +++ b/CalibTracker/SiStripLorentzAngle/test/SiStripLAProfileBooker.py @@ -55,9 +55,9 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('sistripLAProfile') -process.MessageLogger.destinations = cms.untracked.vstring('LAProfileDebug') +process.MessageLogger.cerr.enable = False -process.MessageLogger.LAProfileDebug = cms.untracked.PSet( +process.MessageLogger.files.LAProfileDebug = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), noLineBreaks = cms.untracked.bool(False), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)) diff --git a/CalibTracker/SiStripLorentzAngle/test/job_scripts/template.py b/CalibTracker/SiStripLorentzAngle/test/job_scripts/template.py index ec32dd798854a..0135f0609e770 100644 --- a/CalibTracker/SiStripLorentzAngle/test/job_scripts/template.py +++ b/CalibTracker/SiStripLorentzAngle/test/job_scripts/template.py @@ -54,9 +54,9 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('sistripLAProfile') -process.MessageLogger.destinations = cms.untracked.vstring('MY_DEBUG_NUMBER') +process.MessageLogger.cerr.enable = False -process.MessageLogger.MY_DEBUG_NUMBER = cms.untracked.PSet( +process.MessageLogger.files.MY_DEBUG_NUMBER = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), noLineBreaks = cms.untracked.bool(False), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)) diff --git a/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py b/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py index 5cd29d7e52e34..b0050992c885e 100644 --- a/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py +++ b/CalibTracker/SiStripQuality/test/test_SiStripQualityStatistics_cfg.py @@ -24,9 +24,11 @@ # Messages ################################################################### process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiStripQualityStatistics") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("WARNING"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -34,7 +36,6 @@ ), SiStripQualityStatistics = cms.untracked.PSet( limit = cms.untracked.int32(-1)), ) -process.MessageLogger.statistics.append('cout') # process.MessageLogger = cms.Service("MessageLogger", # cout = cms.untracked.PSet(threshold = cms.untracked.string('WARNING')), diff --git a/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py b/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py index d86062c6e48c9..e196e9ddd676e 100644 --- a/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py +++ b/Calibration/EcalAlCaRecoProducers/test/alcaSkimming.py @@ -170,13 +170,11 @@ process.load('Calibration.EcalAlCaRecoProducers.pdfSystematics_cff') process.MessageLogger.cerr = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), noTimeStamps = cms.untracked.bool(False), FwkReport = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), reportEvery = cms.untracked.int32(1000), limit = cms.untracked.int32(10000000) ), @@ -184,11 +182,9 @@ limit = cms.untracked.int32(10000000) ), Root_NoDictionary = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(0) ), FwkSummary = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), reportEvery = cms.untracked.int32(1), limit = cms.untracked.int32(10000000) ), diff --git a/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py b/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py index eecff400e4145..037d325c307ed 100644 --- a/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py +++ b/Calibration/HcalAlCaRecoProducers/test/AlCaIsoTrackFilterProducer_cfg.py @@ -13,8 +13,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag=autoCond['run2_mc'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HcalIsoTrack') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py index 8e193d620a994..850611574d749 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_cfg.py @@ -10,7 +10,7 @@ process.GlobalTag.globaltag=autoCond['run1_mc'] process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories+=cms.untracked.vstring('GammaJetAnalysis') + process.MessageLogger.cerr.FwkReport.reportEvery=cms.untracked.int32(1000) #load the gammaJet analyzer diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py index b5d52613afcec..d3a52263200ff 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_cfg.py @@ -10,7 +10,7 @@ process.GlobalTag.globaltag=autoCond['run1_data'] process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories+=cms.untracked.vstring('GammaJetAnalysis') + process.MessageLogger.cerr.FwkReport.reportEvery=cms.untracked.int32(1000) diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py index b5872420ecc5d..3e75f8cdace4a 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_data2012_noGJetProd_cfg.py @@ -10,7 +10,7 @@ process.GlobalTag.globaltag=autoCond['run1_data'] process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories+=cms.untracked.vstring('GammaJetAnalysis') + process.MessageLogger.cerr.FwkReport.reportEvery=cms.untracked.int32(1000) #load the analyzer diff --git a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py index b68aae0670993..94bc95861ff18 100644 --- a/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/gammaJetAnalysis_noGJetProd_cfg.py @@ -10,7 +10,7 @@ process.GlobalTag.globaltag=autoCond['run2_mc'] process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories+=cms.untracked.vstring('GammaJetAnalysis') + #process.MessageLogger.cerr.FwkReport.reportEvery=cms.untracked.int32(1000) #load the response corrections calculator diff --git a/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuonHighEta_cfg.py b/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuonHighEta_cfg.py index e790bd28607dc..55be2a0394c3a 100644 --- a/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuonHighEta_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuonHighEta_cfg.py @@ -19,8 +19,8 @@ process.load("RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi") process.load("Calibration.HcalCalibAlgos.hcalHBHEMuonHighEta_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HBHEMuon') + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100) diff --git a/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuon_cfg.py b/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuon_cfg.py index 6de4a1489e394..8ea085547cc0e 100644 --- a/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuon_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/hcalHBHEMuon_cfg.py @@ -13,8 +13,8 @@ process.load("RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi") process.load("Calibration.HcalCalibAlgos.hcalHBHEMuon_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HBHEMuon') + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.source = cms.Source("PoolSource", diff --git a/Calibration/HcalCalibAlgos/test/python/isoTrackAlCaRecoAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/isoTrackAlCaRecoAnalysis_cfg.py index 446eb883b6e77..a76275f4f0222 100644 --- a/Calibration/HcalCalibAlgos/test/python/isoTrackAlCaRecoAnalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/isoTrackAlCaRecoAnalysis_cfg.py @@ -12,8 +12,8 @@ process.GlobalTag.globaltag=autoCond['run2_mc'] #process.GlobalTag.globaltag = 'START53_V15::All' -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalIsoTrack') + + process.MessageLogger.cerr.FwkReport.reportEvery = 1 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py b/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py index a950c2e4f72b7..fc8d6bd893e1a 100644 --- a/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/isoTrackRecoAnalysis_cfg.py @@ -15,8 +15,8 @@ #process.GlobalTag.globaltag='101X_dataRun2_Prompt_v10' process.GlobalTag.globaltag='106X_dataRun2_v20' #106X_mcRun3_2021_realistic_v3 -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalIsoTrack') + + process.MessageLogger.cerr.FwkReport.reportEvery = 1 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/Calibration/HcalCalibAlgos/test/python/isoTrackStudy_cfg.py b/Calibration/HcalCalibAlgos/test/python/isoTrackStudy_cfg.py index c5af5a26721f9..213e6c34d929f 100644 --- a/Calibration/HcalCalibAlgos/test/python/isoTrackStudy_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/isoTrackStudy_cfg.py @@ -19,8 +19,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag='106X_mcRun3_2021_realistic_v3' -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalIsoTrack') + + process.MessageLogger.cerr.FwkReport.reportEvery = 1 process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/Calibration/HcalCalibAlgos/test/python/recAnalyzerHF_cfg.py b/Calibration/HcalCalibAlgos/test/python/recAnalyzerHF_cfg.py index 868222e1c075b..62ad186d2ba78 100644 --- a/Calibration/HcalCalibAlgos/test/python/recAnalyzerHF_cfg.py +++ b/Calibration/HcalCalibAlgos/test/python/recAnalyzerHF_cfg.py @@ -5,8 +5,8 @@ process.load('Calibration.HcalCalibAlgos.recAnalyzerHF_cfi') process.load("FWCore.MessageService.MessageLogger_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('AnalyzerHF') + + # import of standard configurations process.maxEvents = cms.untracked.PSet( diff --git a/Calibration/IsolatedParticles/test/proto_runIsolatedTracksHcal_cfg.py b/Calibration/IsolatedParticles/test/proto_runIsolatedTracksHcal_cfg.py index 6bbd29824d25f..a128188f46ba0 100644 --- a/Calibration/IsolatedParticles/test/proto_runIsolatedTracksHcal_cfg.py +++ b/Calibration/IsolatedParticles/test/proto_runIsolatedTracksHcal_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 10 -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.categories.append('HLTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(False) diff --git a/Calibration/IsolatedParticles/test/proto_runIsolatedTracksNxNData_cfg.py b/Calibration/IsolatedParticles/test/proto_runIsolatedTracksNxNData_cfg.py index 6c543119127fb..1093cd0bd1127 100644 --- a/Calibration/IsolatedParticles/test/proto_runIsolatedTracksNxNData_cfg.py +++ b/Calibration/IsolatedParticles/test/proto_runIsolatedTracksNxNData_cfg.py @@ -5,8 +5,8 @@ process.load("RecoLocalCalo.EcalRecAlgos.EcalSeverityLevelESProducer_cfi") process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 1000000 -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.categories.append('HLTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) diff --git a/Calibration/TkAlCaRecoProducers/test/Alca_BeamFit_Workflow.py b/Calibration/TkAlCaRecoProducers/test/Alca_BeamFit_Workflow.py index 5eaf1a5c95334..37c18def6cccf 100644 --- a/Calibration/TkAlCaRecoProducers/test/Alca_BeamFit_Workflow.py +++ b/Calibration/TkAlCaRecoProducers/test/Alca_BeamFit_Workflow.py @@ -3,8 +3,8 @@ process = cms.Process("alcaBeamSpotWorkflow") # initialize MessageLogger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ["AlcaBeamSpotProducer"] -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) + +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), default = cms.untracked.PSet( @@ -15,7 +15,7 @@ limit = cms.untracked.int32(0) ) ) -#process.MessageLogger.statistics.append('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.load("Calibration.TkAlCaRecoProducers.AlcaBeamSpotProducer_cff") diff --git a/Calibration/TkAlCaRecoProducers/test/Alca_BeamSpot_Harvester.py b/Calibration/TkAlCaRecoProducers/test/Alca_BeamSpot_Harvester.py index a9988cb54e914..a26d72110ecd2 100644 --- a/Calibration/TkAlCaRecoProducers/test/Alca_BeamSpot_Harvester.py +++ b/Calibration/TkAlCaRecoProducers/test/Alca_BeamSpot_Harvester.py @@ -18,8 +18,8 @@ # initialize MessageLogger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ["AlcaBeamSpotHarvester","AlcaBeamSpotManager"] -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) + +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), default = cms.untracked.PSet( @@ -34,7 +34,7 @@ limit = cms.untracked.int32(0) ) ) -#process.MessageLogger.statistics.append('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.load("Calibration.TkAlCaRecoProducers.AlcaBeamSpotHarvester_cff") diff --git a/CaloOnlineTools/HcalOnlineDb/test/template.py b/CaloOnlineTools/HcalOnlineDb/test/template.py index fce141f01b798..4e99bcc1cdaca 100644 --- a/CaloOnlineTools/HcalOnlineDb/test/template.py +++ b/CaloOnlineTools/HcalOnlineDb/test/template.py @@ -4,7 +4,7 @@ process = cms.Process("TEST", Run3) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('LUT') + process.source = cms.Source("EmptySource") process.source.firstRun = cms.untracked.uint32( __RUN__ ) diff --git a/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_create_cfg.py b/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_create_cfg.py index 2eeeba9738928..82d9b8c8462c5 100644 --- a/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_create_cfg.py +++ b/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_create_cfg.py @@ -3,9 +3,7 @@ process = cms.Process( "CREATE" ) process.load( "FWCore.MessageLogger.MessageLogger_cfi" ) -process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool( True ) -) +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32( 1 ) diff --git a/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_read_cfg.py b/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_read_cfg.py index 295fe3e71fc7d..7acb905832b00 100644 --- a/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_read_cfg.py +++ b/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_read_cfg.py @@ -3,9 +3,7 @@ process = cms.Process( "READ" ) process.load( "FWCore.MessageLogger.MessageLogger_cfi" ) -process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool( True ) -) +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32( 250 ) diff --git a/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_update_cfg.py b/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_update_cfg.py index c7023afa2de4d..a2f0dc688c0db 100644 --- a/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_update_cfg.py +++ b/CommonTools/TriggerUtils/test/GenericTriggerEventFlag_AlCaRecoTriggerBitsRcd_update_cfg.py @@ -3,9 +3,7 @@ process = cms.Process( "UPDATE" ) process.load( "FWCore.MessageLogger.MessageLogger_cfi" ) -process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool( True ) -) +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32( 1 ) diff --git a/CommonTools/TriggerUtils/test/genericTriggerEventFlagTest_cfg.py b/CommonTools/TriggerUtils/test/genericTriggerEventFlagTest_cfg.py index da4637a283fc6..3dc867ecc0b5c 100644 --- a/CommonTools/TriggerUtils/test/genericTriggerEventFlagTest_cfg.py +++ b/CommonTools/TriggerUtils/test/genericTriggerEventFlagTest_cfg.py @@ -4,7 +4,7 @@ ## Logging process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append( 'GenericTriggerEventFlag' ) + process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.GenericTriggerEventFlag = cms.untracked.PSet( limit = cms.untracked.int32( -1 ) ) process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool( True ) ) diff --git a/CondFormats/PCLConfig/test/AlignPCLThresholdsReader_cfg.py b/CondFormats/PCLConfig/test/AlignPCLThresholdsReader_cfg.py index af1810cf68061..21700edd84724 100644 --- a/CondFormats/PCLConfig/test/AlignPCLThresholdsReader_cfg.py +++ b/CondFormats/PCLConfig/test/AlignPCLThresholdsReader_cfg.py @@ -6,10 +6,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("AlignPCLThresholdsReader") -process.MessageLogger.categories.append("AlignPCLThresholds") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -18,7 +20,6 @@ AlignPCLThresholdsReader = cms.untracked.PSet( limit = cms.untracked.int32(-1)), AlignPCLThresholds = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty Source diff --git a/CondFormats/PCLConfig/test/AlignPCLThresholdsWriter_cfg.py b/CondFormats/PCLConfig/test/AlignPCLThresholdsWriter_cfg.py index a6b677ce18790..fb68fb72d06b1 100644 --- a/CondFormats/PCLConfig/test/AlignPCLThresholdsWriter_cfg.py +++ b/CondFormats/PCLConfig/test/AlignPCLThresholdsWriter_cfg.py @@ -7,10 +7,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("AlignPCLThresholdsWriter") -process.MessageLogger.categories.append("AlignPCLThresholds") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -19,7 +21,6 @@ AlignPCLThresholdsWriter = cms.untracked.PSet( limit = cms.untracked.int32(-1)), AlignPCLThresholds = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty source diff --git a/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py b/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py index 9d3b108680f96..93c112e9ffa38 100644 --- a/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py +++ b/CondFormats/SiPixelObjects/test/FastSiPixelFEDChannelContainerFromQuality_cfg.py @@ -7,11 +7,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("FastSiPixelFEDChannelContainerFromQuality") -process.MessageLogger.categories.append("SiPixelFEDChannelContainer") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), + enableStatistics = cms.untracked.bool(True), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), reportEvery = cms.untracked.int32(1000) @@ -19,7 +20,6 @@ FastSiPixelFEDChannelContainerFromQuality = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelFEDChannelContainer = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty Source diff --git a/CondFormats/SiPixelObjects/test/SiPixelBadFEDChannelSimulationSanityChecker_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelBadFEDChannelSimulationSanityChecker_cfg.py index 9bb1960122880..68cce441589ef 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelBadFEDChannelSimulationSanityChecker_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelBadFEDChannelSimulationSanityChecker_cfg.py @@ -6,11 +6,13 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelBadFEDChannelSimulationSanityChecker") -process.MessageLogger.categories.append("SiPixelFEDChannelContainer") -process.MessageLogger.categories.append("SiPixelQualityProbabilities") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -20,7 +22,7 @@ SiPixelFEDChannelContainer = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelQualityProbabilities = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') +process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) ## ## Empty Source diff --git a/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerFromQualityConverter_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerFromQualityConverter_cfg.py index 4a7915a0002dd..ae4d1ce9fb280 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerFromQualityConverter_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerFromQualityConverter_cfg.py @@ -5,10 +5,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelFEDChannelContainerFromQualityConverter") -process.MessageLogger.categories.append("SiPixelFEDChannelContainer") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -17,7 +19,6 @@ SiPixelFEDChannelContainerFromQualityConverter = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelFEDChannelContainer = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty source diff --git a/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerTestReader_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerTestReader_cfg.py index 6cd08e5be9a09..fd64a2f120651 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerTestReader_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerTestReader_cfg.py @@ -6,10 +6,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelFEDChannelContainerTestReader") -process.MessageLogger.categories.append("SiPixelFEDChannelContainer") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -18,7 +20,6 @@ SiPixelFEDChannelContainerTestReader = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelFEDChannelContainer = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty Source diff --git a/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerWriteFromASCII_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerWriteFromASCII_cfg.py index fc354b0b820dc..4946df97254bb 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerWriteFromASCII_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelFEDChannelContainerWriteFromASCII_cfg.py @@ -5,10 +5,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelFEDChannelContainerWriteFromASCII") -process.MessageLogger.categories.append("SiPixelFEDChannelContainer") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -17,7 +19,6 @@ SiPixelFEDChannelContainerWriteFromASCII = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelFEDChannelContainer = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty source diff --git a/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestReader_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestReader_cfg.py index c23b308f35527..036feb046a889 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestReader_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestReader_cfg.py @@ -6,10 +6,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelQualityProbabilitiesTestReader") -process.MessageLogger.categories.append("SiPixelQualityProbabilities") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -18,7 +20,6 @@ SiPixelQualityProbabilitiesTestReader = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelQualityProbabilities = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty Source diff --git a/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestWriter_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestWriter_cfg.py index 2a6fdcb25743b..73946b522ff52 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestWriter_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesTestWriter_cfg.py @@ -5,10 +5,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelQualityProbabilitiesTestWriter") -process.MessageLogger.categories.append("SiPixelQualityProbabilities") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -17,7 +19,7 @@ SiPixelQualityProbabilitiesTestWriter = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelQualityProbabilities = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') + ## ## Empty source diff --git a/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesWriteFromASCII_cfg.py b/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesWriteFromASCII_cfg.py index 7e1bd3eacbe59..57c5af8304aed 100644 --- a/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesWriteFromASCII_cfg.py +++ b/CondFormats/SiPixelObjects/test/SiPixelQualityProbabilitiesWriteFromASCII_cfg.py @@ -5,10 +5,12 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelQualityProbabilitiesWriteFromASCII") -process.MessageLogger.categories.append("SiPixelQualityProbabilities") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -17,7 +19,6 @@ SiPixelQualityProbabilitiesWriteFromASCII = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPixelQualityProbabilities = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') ## ## Empty source diff --git a/CondTools/BeamSpot/test/BeamSpotOnlineHLTRcdReader_cfg.py b/CondTools/BeamSpot/test/BeamSpotOnlineHLTRcdReader_cfg.py index 492ad875512c2..c11db68926bd5 100644 --- a/CondTools/BeamSpot/test/BeamSpotOnlineHLTRcdReader_cfg.py +++ b/CondTools/BeamSpot/test/BeamSpotOnlineHLTRcdReader_cfg.py @@ -3,7 +3,6 @@ process = cms.Process("READ") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 100000 # do not clog output with IO process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10000000) ) # large number of events is needed since we probe 5000LS for run (see below) @@ -66,4 +65,4 @@ ) # Put module in path: -process.p = cms.Path(process.beamspotonlinereader) \ No newline at end of file +process.p = cms.Path(process.beamspotonlinereader) diff --git a/CondTools/BeamSpot/test/BeamSpotOnlineLegacyRcdReader_cfg.py b/CondTools/BeamSpot/test/BeamSpotOnlineLegacyRcdReader_cfg.py index 6a21912732dad..096d7322de93f 100644 --- a/CondTools/BeamSpot/test/BeamSpotOnlineLegacyRcdReader_cfg.py +++ b/CondTools/BeamSpot/test/BeamSpotOnlineLegacyRcdReader_cfg.py @@ -3,7 +3,6 @@ process = cms.Process("READ") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 100000 # do not clog output with IO process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10000000) ) # large number of events is needed since we probe 5000LS for run (see below) @@ -67,4 +66,4 @@ ) # Put module in path: -process.p = cms.Path(process.beamspotonlinereader) \ No newline at end of file +process.p = cms.Path(process.beamspotonlinereader) diff --git a/CondTools/BeamSpot/test/BeamSpotRcdRead_cfg.py b/CondTools/BeamSpot/test/BeamSpotRcdRead_cfg.py index 9132e1e07331f..2469a9cf397f1 100644 --- a/CondTools/BeamSpot/test/BeamSpotRcdRead_cfg.py +++ b/CondTools/BeamSpot/test/BeamSpotRcdRead_cfg.py @@ -3,7 +3,6 @@ process = cms.Process("READ") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 1000000 # do not clog output with IO process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10000000) ) # large number of events is needed since we probe 5000LS for run (see below) diff --git a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_TEMPL_cfg.py b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_TEMPL_cfg.py index fdf8063bbf0c9..a3cccaf738a15 100644 --- a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_TEMPL_cfg.py +++ b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_TEMPL_cfg.py @@ -22,7 +22,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1000) )) diff --git a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_cfg.py b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_cfg.py index da2ddaee8c264..5717dd975db21 100644 --- a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_cfg.py +++ b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdRead_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("READ") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1000) )) diff --git a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_TEMPL_cfg.py b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_TEMPL_cfg.py index 5fc8957f0f897..6b478462ac724 100644 --- a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_TEMPL_cfg.py +++ b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_TEMPL_cfg.py @@ -59,7 +59,7 @@ options.parseArguments() process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) )) diff --git a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_cfg.py b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_cfg.py index 3e82230768c0a..2c83d52e4d2c1 100644 --- a/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_cfg.py +++ b/CondTools/HLT/test/AlCaRecoTriggerBitsRcdUpdate_cfg.py @@ -23,7 +23,7 @@ process = cms.Process("UPDATEDB") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet(INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) )) diff --git a/CondTools/L1Trigger/test/L1ConfigWriteIOVDummy_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteIOVDummy_cfg.py index d4791b90f9579..824e1090cf70d 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteIOVDummy_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteIOVDummy_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteIOVDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWriteIOVOnline_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteIOVOnline_cfg.py index 49e3b89e469b9..65c7e556cd81f 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteIOVOnline_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteIOVOnline_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteIOVOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWritePayloadCondDB_cfg.py b/CondTools/L1Trigger/test/L1ConfigWritePayloadCondDB_cfg.py index 424b866412b70..ebf95ec1e07ff 100644 --- a/CondTools/L1Trigger/test/L1ConfigWritePayloadCondDB_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWritePayloadCondDB_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWritePayloadDummy_cfg.py b/CondTools/L1Trigger/test/L1ConfigWritePayloadDummy_cfg.py index 040666885ebcc..c019351e82a31 100644 --- a/CondTools/L1Trigger/test/L1ConfigWritePayloadDummy_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWritePayloadDummy_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWritePayloadOnline_cfg.py b/CondTools/L1Trigger/test/L1ConfigWritePayloadOnline_cfg.py index a71b73f114e40..ad7a7db47ce31 100644 --- a/CondTools/L1Trigger/test/L1ConfigWritePayloadOnline_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWritePayloadOnline_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWriteRSIOVOnline_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteRSIOVOnline_cfg.py index ed13f29961792..b6819ce33fd2e 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteRSIOVOnline_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteRSIOVOnline_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteRSIOVOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWriteRSOnline_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteRSOnline_cfg.py index d94bb4e140027..d76fda0d6e265 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteRSOnline_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteRSOnline_cfg.py @@ -5,7 +5,7 @@ process = cms.Process("L1ConfigWriteRSOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWriteRSPayloadOnline_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteRSPayloadOnline_cfg.py index 39431b91006ac..eafd37f2bfe14 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteRSPayloadOnline_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteRSPayloadOnline_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteRSPayloadOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWriteSingleIOV_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteSingleIOV_cfg.py index 316e41da2a696..257cfd7e3869f 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteSingleIOV_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteSingleIOV_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("L1ConfigWriteIOVDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1ConfigWriteSinglePayload_cfg.py b/CondTools/L1Trigger/test/L1ConfigWriteSinglePayload_cfg.py index e0868eedcb849..1249a34699979 100644 --- a/CondTools/L1Trigger/test/L1ConfigWriteSinglePayload_cfg.py +++ b/CondTools/L1Trigger/test/L1ConfigWriteSinglePayload_cfg.py @@ -5,7 +5,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/L1GtRunSettingsViewer_cfg.py b/CondTools/L1Trigger/test/L1GtRunSettingsViewer_cfg.py index 0be30d4710ebc..cec89ae4720ca 100644 --- a/CondTools/L1Trigger/test/L1GtRunSettingsViewer_cfg.py +++ b/CondTools/L1Trigger/test/L1GtRunSettingsViewer_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigValidation") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/init_cfg.py b/CondTools/L1Trigger/test/init_cfg.py index 7bbe5dbcf5bab..474ccb639f823 100644 --- a/CondTools/L1Trigger/test/init_cfg.py +++ b/CondTools/L1Trigger/test/init_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/l1o2otestanalyzer_cfg.py b/CondTools/L1Trigger/test/l1o2otestanalyzer_cfg.py index f8e65e2c1d84e..34e419892ad52 100644 --- a/CondTools/L1Trigger/test/l1o2otestanalyzer_cfg.py +++ b/CondTools/L1Trigger/test/l1o2otestanalyzer_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigValidation") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1Trigger/test/validate-l1Key.py b/CondTools/L1Trigger/test/validate-l1Key.py index 61f9a61cef069..b78ad8bf1dfc7 100644 --- a/CondTools/L1Trigger/test/validate-l1Key.py +++ b/CondTools/L1Trigger/test/validate-l1Key.py @@ -109,9 +109,10 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['*'] -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), DEBUG=cms.untracked.PSet( limit=cms.untracked.int32(-1) diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteIOVDummyExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteIOVDummyExt_cfg.py index 3442b9108d437..9f7716cff1eaa 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteIOVDummyExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteIOVDummyExt_cfg.py @@ -10,7 +10,7 @@ process = cms.Process("L1ConfigWriteIOVDummyExt") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteIOVOnlineExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteIOVOnlineExt_cfg.py index 40cbfd7459307..c21763852d01b 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteIOVOnlineExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteIOVOnlineExt_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteIOVOnlineExt") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWritePayloadCondDBExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWritePayloadCondDBExt_cfg.py index 9adbe1650f147..9c6bf7223ed39 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWritePayloadCondDBExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWritePayloadCondDBExt_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWritePayloadDummyExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWritePayloadDummyExt_cfg.py index d840617977b1c..617bea7c348e3 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWritePayloadDummyExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWritePayloadDummyExt_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWritePayloadOnlineExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWritePayloadOnlineExt_cfg.py index 400d951e16ea3..c1f66c111e641 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWritePayloadOnlineExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWritePayloadOnlineExt_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') process.MessageLogger.suppressInfo = cms.untracked.vstring('L1TMuonBarrelParamsOnlineProd') # suppressDebug, suppressWarning diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteRSIOVOnlineExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteRSIOVOnlineExt_cfg.py index c114bc28677df..4a36127755797 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteRSIOVOnlineExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteRSIOVOnlineExt_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteRSIOVOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteRSOnlineExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteRSOnlineExt_cfg.py index f482033d54d29..601e1445cf211 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteRSOnlineExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteRSOnlineExt_cfg.py @@ -5,7 +5,7 @@ process = cms.Process("L1ConfigWriteRSOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteRSPayloadOnlineExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteRSPayloadOnlineExt_cfg.py index 3eb923c9cd54f..3b6ebeea149a8 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteRSPayloadOnlineExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteRSPayloadOnlineExt_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWriteRSPayloadOnline") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteSingleIOVExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteSingleIOVExt_cfg.py index be6d626bc8f3e..660c3b4951546 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteSingleIOVExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteSingleIOVExt_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("L1ConfigWriteIOVDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/L1ConfigWriteSinglePayloadExt_cfg.py b/CondTools/L1TriggerExt/test/L1ConfigWriteSinglePayloadExt_cfg.py index 08bddc4c4d8bf..ff8e7a9184db2 100644 --- a/CondTools/L1TriggerExt/test/L1ConfigWriteSinglePayloadExt_cfg.py +++ b/CondTools/L1TriggerExt/test/L1ConfigWriteSinglePayloadExt_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/init_cfg.py b/CondTools/L1TriggerExt/test/init_cfg.py index d18aa6a4d2f7d..55c41b0e30e28 100644 --- a/CondTools/L1TriggerExt/test/init_cfg.py +++ b/CondTools/L1TriggerExt/test/init_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/L1TriggerExt/test/l1o2otestanalyzer_cfg.py b/CondTools/L1TriggerExt/test/l1o2otestanalyzer_cfg.py index 631580134df86..de0b09b120625 100644 --- a/CondTools/L1TriggerExt/test/l1o2otestanalyzer_cfg.py +++ b/CondTools/L1TriggerExt/test/l1o2otestanalyzer_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigValidation") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/RPC/test/L1RPCConeDefinitionWriteSinglePayload_cfg.py b/CondTools/RPC/test/L1RPCConeDefinitionWriteSinglePayload_cfg.py index 85cd0b6d74a0e..fddee5ef66070 100644 --- a/CondTools/RPC/test/L1RPCConeDefinitionWriteSinglePayload_cfg.py +++ b/CondTools/RPC/test/L1RPCConeDefinitionWriteSinglePayload_cfg.py @@ -6,7 +6,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/RPC/test/L1RPCConfigWriteSinglePayload_cfg.py b/CondTools/RPC/test/L1RPCConfigWriteSinglePayload_cfg.py index edbc0c810c0ed..81e3f3a75b477 100644 --- a/CondTools/RPC/test/L1RPCConfigWriteSinglePayload_cfg.py +++ b/CondTools/RPC/test/L1RPCConfigWriteSinglePayload_cfg.py @@ -6,7 +6,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/CondTools/RPC/test/RPCCPPFLinkMapPopConAnalyzer_cfg.py b/CondTools/RPC/test/RPCCPPFLinkMapPopConAnalyzer_cfg.py index 833d60086675d..ca4bd90f9469e 100644 --- a/CondTools/RPC/test/RPCCPPFLinkMapPopConAnalyzer_cfg.py +++ b/CondTools/RPC/test/RPCCPPFLinkMapPopConAnalyzer_cfg.py @@ -31,8 +31,7 @@ , interval = cms.uint64(1) ) -process.MessageLogger.destinations.append("RPCCPPFLinkMapPopConAnalyzer_log") -process.MessageLogger.RPCCPPFLinkMapPopConAnalyzer_log = cms.untracked.PSet( +process.MessageLogger.files.RPCCPPFLinkMapPopConAnalyzer_log = cms.untracked.PSet( threshold = cms.untracked.string("INFO") , FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) diff --git a/CondTools/RPC/test/RPCDCCLinkMapPopConAnalyzer_cfg.py b/CondTools/RPC/test/RPCDCCLinkMapPopConAnalyzer_cfg.py index 3dbaab9fc8b68..4f83f6584ac3a 100644 --- a/CondTools/RPC/test/RPCDCCLinkMapPopConAnalyzer_cfg.py +++ b/CondTools/RPC/test/RPCDCCLinkMapPopConAnalyzer_cfg.py @@ -30,8 +30,7 @@ , interval = cms.uint64(1) ) -process.MessageLogger.destinations.append("RPCDCCLinkMapPopConAnalyzer_log") -process.MessageLogger.RPCDCCLinkMapPopConAnalyzer_log = cms.untracked.PSet( +process.MessageLogger.files.RPCDCCLinkMapPopConAnalyzer_log = cms.untracked.PSet( threshold = cms.untracked.string("INFO") , FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) diff --git a/CondTools/RPC/test/RPCLBLinkMapPopConAnalyzer_cfg.py b/CondTools/RPC/test/RPCLBLinkMapPopConAnalyzer_cfg.py index fbadc94c8630a..7470697481949 100644 --- a/CondTools/RPC/test/RPCLBLinkMapPopConAnalyzer_cfg.py +++ b/CondTools/RPC/test/RPCLBLinkMapPopConAnalyzer_cfg.py @@ -30,8 +30,7 @@ , interval = cms.uint64(1) ) -process.MessageLogger.destinations.append("RPCLBLinkMapPopConAnalyzer_log") -process.MessageLogger.RPCLBLinkMapPopConAnalyzer_log = cms.untracked.PSet( +process.MessageLogger.files.RPCLBLinkMapPopConAnalyzer_log = cms.untracked.PSet( threshold = cms.untracked.string("INFO") , FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) diff --git a/CondTools/RPC/test/RPCOMTFLinkMapPopConAnalyzer_cfg.py b/CondTools/RPC/test/RPCOMTFLinkMapPopConAnalyzer_cfg.py index 060fed18d376c..a2df9dd01fed8 100644 --- a/CondTools/RPC/test/RPCOMTFLinkMapPopConAnalyzer_cfg.py +++ b/CondTools/RPC/test/RPCOMTFLinkMapPopConAnalyzer_cfg.py @@ -31,8 +31,7 @@ , interval = cms.uint64(1) ) -process.MessageLogger.destinations.append("RPCOMTFLinkMapPopConAnalyzer_log") -process.MessageLogger.RPCOMTFLinkMapPopConAnalyzer_log = cms.untracked.PSet( +process.MessageLogger.files.RPCOMTFLinkMapPopConAnalyzer_log = cms.untracked.PSet( threshold = cms.untracked.string("INFO") , FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) diff --git a/CondTools/RPC/test/RPCTwinMuxLinkMapPopConAnalyzer_cfg.py b/CondTools/RPC/test/RPCTwinMuxLinkMapPopConAnalyzer_cfg.py index 76d16962c4cfc..313f93e6c2444 100644 --- a/CondTools/RPC/test/RPCTwinMuxLinkMapPopConAnalyzer_cfg.py +++ b/CondTools/RPC/test/RPCTwinMuxLinkMapPopConAnalyzer_cfg.py @@ -30,8 +30,7 @@ , interval = cms.uint64(1) ) -process.MessageLogger.destinations.append("RPCTwinMuxLinkMapPopConAnalyzer_log") -process.MessageLogger.RPCTwinMuxLinkMapPopConAnalyzer_log = cms.untracked.PSet( +process.MessageLogger.files.RPCTwinMuxLinkMapPopConAnalyzer_log = cms.untracked.PSet( threshold = cms.untracked.string("INFO") , FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) diff --git a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py index ece038cf6bc53..cb0f654fdd124 100644 --- a/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py +++ b/CondTools/SiPhase2Tracker/test/SiPhase2OuterTrackerLorentzAngleWriter_cfg.py @@ -10,10 +10,12 @@ # Messages ################################################################### process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPhase2OuterTrackerLorentzAngleWriter") -process.MessageLogger.categories.append("SiPhase2OuterTrackerLorentzAngle") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -22,7 +24,6 @@ SiPhase2OuterTrackerLorentzAngleWriter = cms.untracked.PSet( limit = cms.untracked.int32(-1)), SiPhase2OuterTrackerLorentzAngle = cms.untracked.PSet( limit = cms.untracked.int32(-1)), ) -process.MessageLogger.statistics.append('cout') tag = 'SiPhase2OuterTrackerLorentzAngle_T15' suffix = 'v0' diff --git a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py index d8241988294ad..f4bd52f2d531c 100644 --- a/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py +++ b/CondTools/SiPixel/test/SiPixelDynamicInefficiencyDB_cfg.py @@ -7,8 +7,8 @@ process = cms.Process("SiPixelInclusiveBuilder") process.load("FWCore.MessageService.MessageLogger_cfi") -#process.MessageLogger.destinations = cms.untracked.vstring("cout") -#process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.cout = dict(threshold = "INFO", enable = True) process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/CondTools/SiPixel/test/SiPixelGainCalibScaler_cfg.py b/CondTools/SiPixel/test/SiPixelGainCalibScaler_cfg.py index 80eee74a06e02..000a59e292174 100644 --- a/CondTools/SiPixel/test/SiPixelGainCalibScaler_cfg.py +++ b/CondTools/SiPixel/test/SiPixelGainCalibScaler_cfg.py @@ -30,9 +30,11 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiPixelGainCalibScaler") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -40,7 +42,6 @@ ), SiPixelGainCalibScaler = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') process.load("Configuration.Geometry.GeometryRecoDB_cff") # Ideal geometry and interface process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/CondTools/SiPixel/test/SiPixelInclusiveBuilder_cfg.py b/CondTools/SiPixel/test/SiPixelInclusiveBuilder_cfg.py index 65f951191fbe6..3c2db72a7a31e 100644 --- a/CondTools/SiPixel/test/SiPixelInclusiveBuilder_cfg.py +++ b/CondTools/SiPixel/test/SiPixelInclusiveBuilder_cfg.py @@ -8,8 +8,8 @@ process = cms.Process("SiPixelInclusiveBuilder") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = cms.untracked.vstring("cout") -process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +process.MessageLogger.cerr.enable = False +process.MessageLogger.cout = dict(enable = True, threshold = "INFO") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py b/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py index df601781acba9..ae20854e22503 100644 --- a/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py +++ b/CondTools/SiPixel/test/SiPixelLorentzAngleDB_cfg.py @@ -8,8 +8,8 @@ process = cms.Process("SiPixelInclusiveBuilder") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = cms.untracked.vstring("cout") -process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +process.MessageLogger.cerr.enable = False +process.MessageLogger.cout = dict(enable = True, threshold = "INFO") process.load("Configuration.StandardSequences.MagneticField_cff") diff --git a/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py b/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py index edc4379312887..33b4940729f0c 100755 --- a/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py +++ b/CondTools/SiPixel/test/SiPixelVCalDB_cfg.py @@ -55,8 +55,8 @@ ) # MESSAGER -process.MessageLogger.destinations = cms.untracked.vstring('cout') -process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string(threshold)) +process.MessageLogger.cerr.enable = False +process.MessageLogger.cout = dict(enable = True, threshold = threshold) # BACK UP DATABASE FILE user = getpass.getuser() diff --git a/CondTools/SiStrip/test/SiStripApvGainRescaler_cfg.py b/CondTools/SiStrip/test/SiStripApvGainRescaler_cfg.py index 558988df18f0d..db1c01d5b4b98 100644 --- a/CondTools/SiStrip/test/SiStripApvGainRescaler_cfg.py +++ b/CondTools/SiStrip/test/SiStripApvGainRescaler_cfg.py @@ -26,9 +26,11 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiStripGain2RescaleByGain1") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -36,7 +38,6 @@ ), SiStripGain2RescaleByGain1 = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') from Configuration.AlCa.GlobalTag import GlobalTag diff --git a/CondTools/SiStrip/test/SiStripChannelGainFromDBMiscalibrator_cfg.py b/CondTools/SiStrip/test/SiStripChannelGainFromDBMiscalibrator_cfg.py index 7508051f312a7..0dd81cc625fed 100644 --- a/CondTools/SiStrip/test/SiStripChannelGainFromDBMiscalibrator_cfg.py +++ b/CondTools/SiStrip/test/SiStripChannelGainFromDBMiscalibrator_cfg.py @@ -27,9 +27,11 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiStripChannelGainFromDBMiscalibrator") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("WARNING"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -37,7 +39,6 @@ ), SiStripChannelGainFromDBMiscalibrator = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') process.load("Configuration.Geometry.GeometryRecoDB_cff") # Ideal geometry and interface process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/CondTools/SiStrip/test/SiStripNoiseFromDBMiscalibrator_cfg.py b/CondTools/SiStrip/test/SiStripNoiseFromDBMiscalibrator_cfg.py index 9e57629503ea7..704bce5839683 100644 --- a/CondTools/SiStrip/test/SiStripNoiseFromDBMiscalibrator_cfg.py +++ b/CondTools/SiStrip/test/SiStripNoiseFromDBMiscalibrator_cfg.py @@ -28,9 +28,11 @@ ## MessageLogger ## process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append("SiStripNoisesFromDBMiscalibrator") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), FwkReport = cms.untracked.PSet(limit = cms.untracked.int32(-1), @@ -38,7 +40,6 @@ ), SiStripNoisesFromDBMiscalibrator = cms.untracked.PSet( limit = cms.untracked.int32(-1)) ) -process.MessageLogger.statistics.append('cout') process.load("Configuration.Geometry.GeometryRecoDB_cff") # Ideal geometry and interface process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') diff --git a/Configuration/EcalTB/python/reco_application_tbsim_DetSim-Digi_cfg.py b/Configuration/EcalTB/python/reco_application_tbsim_DetSim-Digi_cfg.py index fed45ec98c6fc..be9d3f9cc93c6 100644 --- a/Configuration/EcalTB/python/reco_application_tbsim_DetSim-Digi_cfg.py +++ b/Configuration/EcalTB/python/reco_application_tbsim_DetSim-Digi_cfg.py @@ -167,28 +167,10 @@ # modify the default behavior of the MessageLogger -process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) -process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'BeamProfileVtxGenerator' - ) - process.MessageLogger.debugModules = cms.untracked.vstring('g4SimHits','generatorSmeared') #Configuring the G4msg.log output -process.MessageLogger.G4msg = cms.untracked.PSet( +process.MessageLogger.files = dict( G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -212,7 +194,7 @@ ,G4cerr = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,BeamProfileVtxGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) - +) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) process.options = cms.untracked.PSet( diff --git a/DPGAnalysis/SiStripTools/python/MessageLogger_cff.py b/DPGAnalysis/SiStripTools/python/MessageLogger_cff.py index 4b578036ee682..1abc0f27bc22c 100644 --- a/DPGAnalysis/SiStripTools/python/MessageLogger_cff.py +++ b/DPGAnalysis/SiStripTools/python/MessageLogger_cff.py @@ -4,7 +4,7 @@ #---------------------------------------------------------------- -MessageLogger.cout.placeholder = cms.untracked.bool(False) +MessageLogger.cout.enable = True MessageLogger.cout.threshold = cms.untracked.string("INFO") MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -13,7 +13,7 @@ reportEvery = cms.untracked.int32(10000) ) -MessageLogger.cerr.placeholder = cms.untracked.bool(False) +MessageLogger.cerr.enable = True MessageLogger.cerr.threshold = cms.untracked.string("WARNING") MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/python/filtertest/MessageLogger_cff.py b/DPGAnalysis/SiStripTools/python/filtertest/MessageLogger_cff.py index 92107a3f8fb71..96b89cb66824b 100644 --- a/DPGAnalysis/SiStripTools/python/filtertest/MessageLogger_cff.py +++ b/DPGAnalysis/SiStripTools/python/filtertest/MessageLogger_cff.py @@ -5,20 +5,18 @@ MessageLogger.categories.append("L1AcceptBunchCrossingNoCollection") MessageLogger.categories.append("EventWithHistoryFilterConfiguration") -MessageLogger.infos.placeholder = cms.untracked.bool(False) -MessageLogger.infos.threshold = cms.untracked.string("INFO") -MessageLogger.infos.default = cms.untracked.PSet( - limit = cms.untracked.int32(10000000) - ) -MessageLogger.infos.FwkReport = cms.untracked.PSet( - reportEvery = cms.untracked.int32(10000) - ) -MessageLogger.infos.L1AcceptBunchCrossingNoCollection = cms.untracked.PSet( - limit = cms.untracked.int32(100) - ) -MessageLogger.cerr.L1AcceptBunchCrossingNoCollection = cms.untracked.PSet( - limit = cms.untracked.int32(100) +MessageLogger.files.infos = dict( + threshold = cms.untracked.string("INFO"), + default = cms.untracked.PSet( + limit = cms.untracked.int32(10000000) + ), + FwkReport = cms.untracked.PSet( + reportEvery = cms.untracked.int32(10000) + ), + L1AcceptBunchCrossingNoCollection = cms.untracked.PSet( + limit = cms.untracked.int32(100) ) +) MessageLogger.cerr.threshold = cms.untracked.string("WARNING") diff --git a/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py b/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py index 5d456624591cb..d7aa89236ebcb 100644 --- a/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py +++ b/DPGAnalysis/SiStripTools/test/BigEventsDebugger_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("WARNING") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py b/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py index 6ac7768c70427..65b7ebc711399 100644 --- a/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ByMultiplicityFilterTest_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/MultiplicityMonitor_cfg.py b/DPGAnalysis/SiStripTools/test/MultiplicityMonitor_cfg.py index 620fbff3f47be..2ad8e34df7113 100644 --- a/DPGAnalysis/SiStripTools/test/MultiplicityMonitor_cfg.py +++ b/DPGAnalysis/SiStripTools/test/MultiplicityMonitor_cfg.py @@ -35,7 +35,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -44,7 +44,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py index 901352a89f2ae..149725a253aeb 100644 --- a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_cfg.py @@ -34,7 +34,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -43,7 +43,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py index 2d44208c5e09f..0c634430551ab 100644 --- a/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py +++ b/DPGAnalysis/SiStripTools/test/MultiplicityProducerTest_pixelphase1_cfg.py @@ -34,7 +34,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -43,7 +43,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py b/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py index 16a296cc3c76b..82678811cd040 100644 --- a/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OOTmultiplicity_cfg.py @@ -27,8 +27,8 @@ #---------------------------------------------------------------- -process.MessageLogger.categories.extend(cms.vstring("CondDBESSource")) -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) + +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -40,7 +40,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_cfg.py index 48adf59ca5172..29db344081eb5 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_cfg.py @@ -52,18 +52,14 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.extend(cms.vstring("detids")) -process.MessageLogger.categories.extend(cms.vstring("GeometricDetBuilding","DuplicateHitFinder","BuildingTrackerDetId", - "SubDetectorGeometricDetType","BuildingGeomDetUnits","LookingForFirstStrip", - "BuildingSubDetTypeMap","SubDetTypeMapContent","NumberOfLayers","IsThereTest")) -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = True process.MessageLogger.cout.threshold = cms.untracked.string("INFO") #process.MessageLogger.cout.threshold = cms.untracked.string("WARNING") #process.MessageLogger.debugModules = cms.untracked.vstring("*") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(0) ) -process.MessageLogger.detids = cms.untracked.PSet( +process.MessageLogger.files =dict(detids = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -95,7 +91,8 @@ limit = cms.untracked.int32(100000000) ), threshold = cms.untracked.string("DEBUG") - ) + ) +) process.MessageLogger.cout.DuplicateHitFinder = cms.untracked.PSet( limit = cms.untracked.int32(100000000) ) @@ -106,7 +103,6 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py index 8f4f20d1ec671..297d811e9d1b1 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_phase2_cfg.py @@ -34,17 +34,13 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.extend(cms.vstring("detids")) -process.MessageLogger.categories.extend(cms.vstring("GeometricDetBuilding","DuplicateHitFinder","BuildingTrackerDetId", - "SubDetectorGeometricDetType","BuildingGeomDetUnits","LookingForFirstStrip", - "BuildingSubDetTypeMap","SubDetTypeMapContent","NumberOfLayers","IsThereTest")) -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = True process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.debugModules = cms.untracked.vstring("*") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(0) ) -process.MessageLogger.detids = cms.untracked.PSet( +process.MessageLogger.files = dict( detids = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -77,6 +73,7 @@ ), threshold = cms.untracked.string("DEBUG") ) +) process.MessageLogger.cout.DuplicateHitFinder = cms.untracked.PSet( limit = cms.untracked.int32(100000000) ) @@ -87,7 +84,6 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py index 344dd1c53c2df..8c6f83a43a29d 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_pixelphase1_cfg.py @@ -34,18 +34,14 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.extend(cms.vstring("detids")) -process.MessageLogger.categories.extend(cms.vstring("GeometricDetBuilding","DuplicateHitFinder","BuildingTrackerDetId", - "SubDetectorGeometricDetType","BuildingGeomDetUnits","LookingForFirstStrip", - "BuildingSubDetTypeMap","SubDetTypeMapContent","NumberOfLayers","IsThereTest")) -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = True process.MessageLogger.cout.threshold = cms.untracked.string("INFO") #process.MessageLogger.cout.threshold = cms.untracked.string("WARNING") process.MessageLogger.debugModules = cms.untracked.vstring("*") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(0) ) -process.MessageLogger.detids = cms.untracked.PSet( +process.MessageLogger.files = dict(detids = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -78,6 +74,7 @@ ), threshold = cms.untracked.string("DEBUG") ) +) process.MessageLogger.cout.DuplicateHitFinder = cms.untracked.PSet( limit = cms.untracked.int32(100000000) ) @@ -88,7 +85,6 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py index cefea5bae631c..bec1bd6b21e4d 100644 --- a/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py +++ b/DPGAnalysis/SiStripTools/test/OccupancyPlotsTest_vtxpos_cfg.py @@ -34,7 +34,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("WARNING") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -43,7 +43,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/TIDTECInnerRingInvestigator_cfg.py b/DPGAnalysis/SiStripTools/test/TIDTECInnerRingInvestigator_cfg.py index 3f8c8f92b65d9..2d2dd0736e465 100644 --- a/DPGAnalysis/SiStripTools/test/TIDTECInnerRingInvestigator_cfg.py +++ b/DPGAnalysis/SiStripTools/test/TIDTECInnerRingInvestigator_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_GR09_cfg.py b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_GR09_cfg.py index 914a7ec79cb3b..be26ce0f44e6b 100644 --- a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_GR09_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_GR09_cfg.py @@ -4,9 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('infos') -process.MessageLogger.infos = cms.untracked.PSet( - placeholder = cms.untracked.bool(False), +process.MessageLogger.files.infos = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py index f27c03b560068..1fdbcf794e9c0 100644 --- a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_db_cfg.py @@ -16,9 +16,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('infos') -process.MessageLogger.infos = cms.untracked.PSet( - placeholder = cms.untracked.bool(False), +process.MessageLogger.files.infos = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_dbfile_cfg.py b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_dbfile_cfg.py index b013ce6823872..fabd3c919143e 100644 --- a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_dbfile_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_dbfile_cfg.py @@ -4,9 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('infos') -process.MessageLogger.infos = cms.untracked.PSet( - placeholder = cms.untracked.bool(False), +process.MessageLogger.files.infos = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_fakesource_cfg.py b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_fakesource_cfg.py index 7bea95c1be5eb..c99645e7e8e83 100644 --- a/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_fakesource_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvcyclephaseproducer_test_fakesource_cfg.py @@ -4,9 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('infos') -process.MessageLogger.infos = cms.untracked.PSet( - placeholder = cms.untracked.bool(False), +process.MessageLogger.files.infos = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py b/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py index bf9ed53020b3d..338a3500f4d18 100644 --- a/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvphaseproducertest_cfg.py @@ -27,7 +27,7 @@ #---------------------------------------------------------------- -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -36,7 +36,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py b/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py index 45fa482f3db0f..29f79c8d0f40a 100644 --- a/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py +++ b/DPGAnalysis/SiStripTools/test/apvshotanalyzer_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py b/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py index 39cbeec4b498f..12fbde7da3c08 100644 --- a/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py +++ b/DPGAnalysis/SiStripTools/test/bsvsbpix_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/commonmodeanalyzer_cfg.py b/DPGAnalysis/SiStripTools/test/commonmodeanalyzer_cfg.py index ae6fe2e52336a..4caca131ced56 100644 --- a/DPGAnalysis/SiStripTools/test/commonmodeanalyzer_cfg.py +++ b/DPGAnalysis/SiStripTools/test/commonmodeanalyzer_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py b/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py index 672d8ed6f8ce5..921ade7507cd1 100644 --- a/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py +++ b/DPGAnalysis/SiStripTools/test/cosmicstracks_cfg.py @@ -25,7 +25,7 @@ #---------------------------------------------------------------- -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -34,7 +34,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py b/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py index f6da7a1f065c7..4b066f476e303 100644 --- a/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/eventwithhistoryfiltertest_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py b/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py index 73de7d5586bc5..220aad9bd6862 100644 --- a/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py +++ b/DPGAnalysis/SiStripTools/test/manyfederrors_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("DEBUG") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py b/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py index 0943e7937fe0c..8e2585ad4bb65 100644 --- a/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py +++ b/DPGAnalysis/SiStripTools/test/overlapproblem_EndCapsOTPhase2_cfg.py @@ -19,19 +19,16 @@ process.load("DPGAnalysis.SiStripTools.processOptions_cff") process.load("DPGAnalysis.SiStripTools.MessageLogger_cff") -process.MessageLogger.destinations.extend(cms.vstring("tkdetlayers")) -process.MessageLogger.categories.extend(cms.vstring("NoCluster","ClusterFound","TkDetLayers","DiskNames", - "BuildingPixelForwardLayer","BuildingPhase2OTECRingedLayer", - "BuildingPixelBarrel","BuildingPixelBarrelLayer","BuildingPhase2OTBarrelLayer","Phase2OTBarrelRodRadii")) -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = True #process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.threshold = cms.untracked.string("DEBUG") process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.tkdetlayers = cms.untracked.PSet ( +process.MessageLogger.files = dict(tkdetlayers = cms.untracked.PSet ( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), TkDetLayers = cms.untracked.PSet(limit = cms.untracked.int32(100000)) ) +) process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(0) ) diff --git a/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py b/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py index 11ed01ba01524..3de9779077c8a 100644 --- a/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py +++ b/DPGAnalysis/SiStripTools/test/seedmultiplicity_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("WARNING") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py b/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py index 1b8f04d45d6a4..47eb41ba37d88 100644 --- a/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py +++ b/DPGAnalysis/SiStripTools/test/seedmultiplicity_highmult_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("WARNING") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py b/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py index 16500382bbdc4..e39c0a3352c5f 100644 --- a/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py +++ b/DPGAnalysis/SiStripTools/test/seedmultiplicity_test_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(True) +process.MessageLogger.cerr.enable = cms.untracked.bool(False) #process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") #process.MessageLogger.cerr.default = cms.untracked.PSet( # limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py b/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py index ed0855ad61a22..9b9172e9ec651 100644 --- a/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ssqhistorytest_cfg.py @@ -27,7 +27,7 @@ #---------------------------------------------------------------- -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -36,7 +36,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py b/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py index a71489f2b2c28..131808d630d85 100644 --- a/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py +++ b/DPGAnalysis/SiStripTools/test/ssqhistorytest_fakesource_cfg.py @@ -32,7 +32,7 @@ #---------------------------------------------------------------- -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -41,7 +41,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/SiStripTools/test/trackerdpganalysis_cfg.py b/DPGAnalysis/SiStripTools/test/trackerdpganalysis_cfg.py index 9664cc018e064..a865d98ac6517 100644 --- a/DPGAnalysis/SiStripTools/test/trackerdpganalysis_cfg.py +++ b/DPGAnalysis/SiStripTools/test/trackerdpganalysis_cfg.py @@ -4,9 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('infos') -process.MessageLogger.infos = cms.untracked.PSet( - placeholder = cms.untracked.bool(False), +process.MessageLogger.files.infos = cms.untracked.PSet( threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/DPGAnalysis/Skims/python/BeamSplash_cfg.py b/DPGAnalysis/Skims/python/BeamSplash_cfg.py index a562e3f7ae4b8..b37eb53f2657e 100644 --- a/DPGAnalysis/Skims/python/BeamSplash_cfg.py +++ b/DPGAnalysis/Skims/python/BeamSplash_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") # activate the following lines to get some output -#process.MessageLogger.destinations = cms.untracked.vstring("cout") -#process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.cout = dict(enable = True, threshold = "INFO") process.skimming = cms.EDFilter("BeamSplash", energycuttot = cms.untracked.double(1000.0), diff --git a/DPGAnalysis/Skims/python/ECALActivity_cfg.py b/DPGAnalysis/Skims/python/ECALActivity_cfg.py index dc922cf652e14..0e78b5b141bd3 100644 --- a/DPGAnalysis/Skims/python/ECALActivity_cfg.py +++ b/DPGAnalysis/Skims/python/ECALActivity_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") # activate the following lines to get some output -#process.MessageLogger.destinations = cms.untracked.vstring("cout") -#process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.cout = dict(enable = True, threshold = "INFO") process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/DPGAnalysis/Skims/python/bsc_activity_cfg.py b/DPGAnalysis/Skims/python/bsc_activity_cfg.py index d77916b636d32..eac0a18a5cc95 100644 --- a/DPGAnalysis/Skims/python/bsc_activity_cfg.py +++ b/DPGAnalysis/Skims/python/bsc_activity_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") # activate the following lines to get some output -#process.MessageLogger.destinations = cms.untracked.vstring("cout") -#process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.cout = dict(enable = True, threshold = "INFO") process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/DPGAnalysis/Skims/python/bscnobeamhalo_cfg.py b/DPGAnalysis/Skims/python/bscnobeamhalo_cfg.py index 7c583dd48f792..3c3bb073a00e4 100644 --- a/DPGAnalysis/Skims/python/bscnobeamhalo_cfg.py +++ b/DPGAnalysis/Skims/python/bscnobeamhalo_cfg.py @@ -4,8 +4,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") # activate the following lines to get some output -#process.MessageLogger.destinations = cms.untracked.vstring("cout") -#process.MessageLogger.cout = cms.untracked.PSet(threshold = cms.untracked.string("INFO")) +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.cout = dict(enable = True, threshold = "INFO") process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/DQM/BeamMonitor/test/2011_44X_HI_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2011_44X_HI_Test_beam_dqm_sourceclient-live_cfg.py index b198ed72ef6dc..ac63363468378 100644 --- a/DQM/BeamMonitor/test/2011_44X_HI_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2011_44X_HI_Test_beam_dqm_sourceclient-live_cfg.py @@ -20,7 +20,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['dqmBeamMonitor'] -process.MessageLogger.categories = ['BeamMonitor'] + process.MessageLogger.cerr.threshold = "INFO" #-------------------------- diff --git a/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py index f843c2da26616..087aa7b977c15 100644 --- a/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2011_44X_Test_beam_dqm_sourceclient-live_cfg.py @@ -18,7 +18,7 @@ ####---Massage logger Services----#### process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['dqmBeamMonitor'] -process.MessageLogger.categories = ['BeamMonitor'] + process.MessageLogger.cerr.threshold = "INFO" diff --git a/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py index 6a61fd380a64e..404dab8ec28e1 100644 --- a/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2012_PixelTracksVertices_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py @@ -13,7 +13,7 @@ ####---Massage logger Services----#### process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['dqmBeamMonitor'] -process.MessageLogger.categories = ['BeamMonitor'] + process.MessageLogger.cerr.threshold = "INFO" diff --git a/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py index 65499f6fa842e..3aa07d930fc90 100644 --- a/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2012_PixelTracksVertices_Test_beamspotproblem_dqm_sourceclient-live_cfg.py @@ -9,7 +9,7 @@ ####---Massage logger Services----#### process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['BeamSpotProblemMonitor'] -process.MessageLogger.categories = ['BeamSpotProblemMonitor'] + process.MessageLogger.cerr.threshold = "INFO" diff --git a/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py b/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py index 50bbc9a1111b1..8521ff1d60ea7 100644 --- a/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py +++ b/DQM/BeamMonitor/test/2012_ReducedTrackingSteps_44XOnwards_Test_beam_dqm_sourceclient-live_cfg.py @@ -14,7 +14,7 @@ ####---Massage logger Services----#### process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['dqmBeamMonitor'] -process.MessageLogger.categories = ['BeamMonitor'] + process.MessageLogger.cerr.threshold = "INFO" diff --git a/DQM/BeamMonitor/test/Alca_BeamMonitor_DQM.py b/DQM/BeamMonitor/test/Alca_BeamMonitor_DQM.py index 8a1f7e743f5de..b50aa161faa6a 100644 --- a/DQM/BeamMonitor/test/Alca_BeamMonitor_DQM.py +++ b/DQM/BeamMonitor/test/Alca_BeamMonitor_DQM.py @@ -60,8 +60,8 @@ # initialize MessageLogger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ["AlcaBeamMonitor"] -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) + +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), default = cms.untracked.PSet( @@ -72,7 +72,7 @@ limit = cms.untracked.int32(0) ) ) -#process.MessageLogger.statistics.append('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) diff --git a/DQM/BeamMonitor/test/Alca_BeamMonitor_HARVESTING.py b/DQM/BeamMonitor/test/Alca_BeamMonitor_HARVESTING.py index 522c310fb49eb..459884960db08 100644 --- a/DQM/BeamMonitor/test/Alca_BeamMonitor_HARVESTING.py +++ b/DQM/BeamMonitor/test/Alca_BeamMonitor_HARVESTING.py @@ -11,8 +11,8 @@ # initialize MessageLogger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ["AlcaBeamMonitorClient"] -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) + +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), default = cms.untracked.PSet( @@ -23,7 +23,7 @@ limit = cms.untracked.int32(0) ) ) -#process.MessageLogger.statistics.append('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) diff --git a/DQM/BeamMonitor/test/Alca_BeamMonitor_file.py b/DQM/BeamMonitor/test/Alca_BeamMonitor_file.py index 64a694c83c308..411278346ef57 100644 --- a/DQM/BeamMonitor/test/Alca_BeamMonitor_file.py +++ b/DQM/BeamMonitor/test/Alca_BeamMonitor_file.py @@ -39,8 +39,8 @@ # initialize MessageLogger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ["AlcaBeamMonitor"] -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) + +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), default = cms.untracked.PSet( @@ -51,7 +51,7 @@ limit = cms.untracked.int32(0) ) ) -#process.MessageLogger.statistics.append('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(2000) ) diff --git a/DQM/BeamMonitor/test/HeavyIonBeamMonitor_cfg.py b/DQM/BeamMonitor/test/HeavyIonBeamMonitor_cfg.py index 82b77f81841a8..d78d99bb42ef6 100644 --- a/DQM/BeamMonitor/test/HeavyIonBeamMonitor_cfg.py +++ b/DQM/BeamMonitor/test/HeavyIonBeamMonitor_cfg.py @@ -20,7 +20,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['dqmBeamMonitor'] -process.MessageLogger.categories = ['BeamMonitor'] + process.MessageLogger.cerr.threshold = "INFO" #-------------------------- diff --git a/DQM/BeamMonitor/test/Online_BeamMonitor_file.py b/DQM/BeamMonitor/test/Online_BeamMonitor_file.py index 908bb5984dbd6..def23db610923 100644 --- a/DQM/BeamMonitor/test/Online_BeamMonitor_file.py +++ b/DQM/BeamMonitor/test/Online_BeamMonitor_file.py @@ -26,8 +26,8 @@ # initialize MessageLogger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ["OnlineBeamMonitor"] -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) + +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), default = cms.untracked.PSet( @@ -38,7 +38,7 @@ limit = cms.untracked.int32(0) ) ) -#process.MessageLogger.statistics.append('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) process.source = cms.Source("EmptySource") process.source.numberEventsInRun=cms.untracked.uint32(20) process.source.firstRun = cms.untracked.uint32(336055) diff --git a/DQM/HLTEvF/test/hlt_dqm_sourceclient-file_cfg.py b/DQM/HLTEvF/test/hlt_dqm_sourceclient-file_cfg.py index 8e93f48f5f95c..317b7d8de6471 100644 --- a/DQM/HLTEvF/test/hlt_dqm_sourceclient-file_cfg.py +++ b/DQM/HLTEvF/test/hlt_dqm_sourceclient-file_cfg.py @@ -67,7 +67,7 @@ # # Message Logger # process.load("FWCore.MessageService.MessageLogger_cfi") -# #process.MessageLogger.categories = ['hltResults'] +# # # process.MessageLogger.destinations = ['cout', 'detailedInfo', 'critical'] # process.MessageLogger.cout = cms.untracked.PSet( # #threshold = cms.untracked.string('ERROR'), @@ -80,7 +80,7 @@ # limit = cms.untracked.int32(-1) ## DEBUG, all messages # ) # ) -# process.MessageLogger.categories = ['Status', 'Parameter'] +# # # copy stdout to a file # process.MessageLogger.detailedInfo = process.MessageLogger.cout # process.MessageLogger.debugModules = ['hltResults'] diff --git a/DQM/HLTEvF/test/hlt_muon_dqm-file_cfg.py b/DQM/HLTEvF/test/hlt_muon_dqm-file_cfg.py index 7ac625942dc15..3f507f2619404 100644 --- a/DQM/HLTEvF/test/hlt_muon_dqm-file_cfg.py +++ b/DQM/HLTEvF/test/hlt_muon_dqm-file_cfg.py @@ -64,7 +64,7 @@ # # Message Logger # process.load("FWCore.MessageService.MessageLogger_cfi") -# process.MessageLogger.categories = ['hltResults'] +# # #process.MessageLogger.destinations = ['cout', 'detailedInfo', 'critical'] # process.MessageLogger.cout = cms.untracked.PSet( # #threshold = cms.untracked.string('ERROR'), @@ -77,7 +77,7 @@ # limit = cms.untracked.int32(-1) ## DEBUG, all messages # ) # ) -# process.MessageLogger.categories = ['Status', 'Parameter'] +# # # copy stdout to a file # process.MessageLogger.detailedInfo = process.MessageLogger.cout # process.MessageLogger.debugModules = ['hltResults'] diff --git a/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py b/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py index dc950c94ebc9d..972e2a4ef756e 100644 --- a/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py +++ b/DQM/L1TMonitor/test/l1t_dqm_sourceclient-file_cfg.py @@ -286,25 +286,19 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1tGt'] -process.MessageLogger.categories.append('L1TGT') -process.MessageLogger.destinations = ['L1TDQM_errors', - 'L1TDQM_warnings', - 'L1TDQM_info', - 'L1TDQM_debug' - ] - -process.MessageLogger.L1TDQM_errors = cms.untracked.PSet( + +process.MessageLogger.files.L1TDQM_errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1TDQM_warnings = cms.untracked.PSet( +process.MessageLogger.files.L1TDQM_warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ) ) -process.MessageLogger.L1TDQM_info = cms.untracked.PSet( +process.MessageLogger.files.L1TDQM_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -312,7 +306,7 @@ L1TGT = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1TDQM_debug = cms.untracked.PSet( +process.MessageLogger.files.L1TDQM_debug = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/DQM/Physics/test/PFJet_topDQM_production_cfg.py b/DQM/Physics/test/PFJet_topDQM_production_cfg.py index e750e0a8ab0b4..b2d849c854738 100644 --- a/DQM/Physics/test/PFJet_topDQM_production_cfg.py +++ b/DQM/Physics/test/PFJet_topDQM_production_cfg.py @@ -116,11 +116,11 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopSingleLeptonDQM' ) + process.MessageLogger.cerr.TopSingleLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('SingleTopTChannelLeptonDQM' ) + process.MessageLogger.cerr.SingleTopTChannelLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('TopDiLeptonOfflineDQM') + process.MessageLogger.cerr.TopDiLeptonOfflineDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) process.MessageLogger.cerr.FwkReport.reportEvery = 1 diff --git a/DQM/Physics/test/topDQM_cfg.py b/DQM/Physics/test/topDQM_cfg.py index 0c339cf61b209..94f90d192b4a7 100644 --- a/DQM/Physics/test/topDQM_cfg.py +++ b/DQM/Physics/test/topDQM_cfg.py @@ -44,9 +44,9 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopSingleLeptonDQM' ) + process.MessageLogger.cerr.TopSingleLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('TopDiLeptonOfflineDQM') + process.MessageLogger.cerr.TopDiLeptonOfflineDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) ## check the event content diff --git a/DQM/Physics/test/topDQM_production_PU_cfg.py b/DQM/Physics/test/topDQM_production_PU_cfg.py index fc985b3a71598..9d8f32c3c1603 100644 --- a/DQM/Physics/test/topDQM_production_PU_cfg.py +++ b/DQM/Physics/test/topDQM_production_PU_cfg.py @@ -98,9 +98,9 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -#process.MessageLogger.categories.append('TopSingleLeptonDQM' ) +# #process.MessageLogger.cerr.TopSingleLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -#process.MessageLogger.categories.append('TopDiLeptonOfflineDQM') +# #process.MessageLogger.cerr.TopDiLeptonOfflineDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) process.MessageLogger.cerr.FwkReport.reportEvery = 1000 @@ -208,9 +208,9 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopSingleLeptonDQM' ) + process.MessageLogger.cerr.TopSingleLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('TopDiLeptonOfflineDQM') + process.MessageLogger.cerr.TopDiLeptonOfflineDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) diff --git a/DQM/Physics/test/topDQM_production_cfg.py b/DQM/Physics/test/topDQM_production_cfg.py index 79977c27762d1..2b4f3278e29d6 100644 --- a/DQM/Physics/test/topDQM_production_cfg.py +++ b/DQM/Physics/test/topDQM_production_cfg.py @@ -61,11 +61,11 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopSingleLeptonDQM' ) + process.MessageLogger.cerr.TopSingleLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('TopDiLeptonOfflineDQM') + process.MessageLogger.cerr.TopDiLeptonOfflineDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('SingleTopTChannelLeptonDQM' ) + process.MessageLogger.cerr.SingleTopTChannelLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) process.MessageLogger.cerr.FwkReport.reportEvery = 100 process.MEtoEDMConverter.deleteAfterCopy = cms.untracked.bool(False) ## line added to avoid crash when changing run number diff --git a/DQM/Physics/test/topDQM_production_miniAOD.py b/DQM/Physics/test/topDQM_production_miniAOD.py index 18e0621e140d0..c0e88e60ea1d1 100644 --- a/DQM/Physics/test/topDQM_production_miniAOD.py +++ b/DQM/Physics/test/topDQM_production_miniAOD.py @@ -54,11 +54,11 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopSingleLeptonDQM' ) + process.MessageLogger.cerr.TopSingleLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('TopDiLeptonOfflineDQM') + process.MessageLogger.cerr.TopDiLeptonOfflineDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) -process.MessageLogger.categories.append('SingleTopTChannelLeptonDQM' ) + process.MessageLogger.cerr.SingleTopTChannelLeptonDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) process.MessageLogger.cerr.FwkReport.reportEvery = 100 diff --git a/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_create_cfg.py b/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_create_cfg.py index e0a7a9c6e0ede..e05dd7322836f 100644 --- a/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_create_cfg.py +++ b/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_create_cfg.py @@ -3,9 +3,7 @@ process = cms.Process( "CREATE" ) process.load( "FWCore.MessageLogger.MessageLogger_cfi" ) -process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool( True ) -) +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32( 1 ) diff --git a/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_read_cfg.py b/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_read_cfg.py index d5409f3f94b61..f6c7730370150 100644 --- a/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_read_cfg.py +++ b/DQM/TrackerCommon/test/AlCaRecoTriggerBits_SiStripDQM_read_cfg.py @@ -3,9 +3,7 @@ process = cms.Process( "READ" ) process.load( "FWCore.MessageLogger.MessageLogger_cfi" ) -process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool( True ) -) +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32( 250 ) diff --git a/DQM/TrigXMonitor/test/l1scalers_dqm_file_cfg.py b/DQM/TrigXMonitor/test/l1scalers_dqm_file_cfg.py index d5bc6b8fe305d..e9713c5dc2561 100644 --- a/DQM/TrigXMonitor/test/l1scalers_dqm_file_cfg.py +++ b/DQM/TrigXMonitor/test/l1scalers_dqm_file_cfg.py @@ -88,7 +88,7 @@ # Message Logger #process.load("FWCore.MessageService.MessageLogger_cfi") -#process.MessageLogger.categories = ['hltResults'] +# #process.MessageLogger.destinations = ['cout', 'detailedInfo', 'critical'] #process.MessageLogger.cout = cms.untracked.PSet( #threshold = cms.untracked.string('ERROR'), @@ -102,7 +102,7 @@ #) # ) -# process.MessageLogger.categories = ['Status', 'Parameter'] +# # # copy stdout to a file process.MessageLogger.detailedInfo = process.MessageLogger.cout # process.MessageLogger.debugModules = ['hltResults'] diff --git a/DQM/TrigXMonitor/test/scal_dqm-file_cfg.py b/DQM/TrigXMonitor/test/scal_dqm-file_cfg.py index 12976fd777706..3f803da6ee4b9 100644 --- a/DQM/TrigXMonitor/test/scal_dqm-file_cfg.py +++ b/DQM/TrigXMonitor/test/scal_dqm-file_cfg.py @@ -79,7 +79,7 @@ # Message Logger #process.load("FWCore.MessageService.MessageLogger_cfi") -#process.MessageLogger.categories = ['hltResults'] +# #process.MessageLogger.destinations = ['cout', 'detailedInfo', 'critical'] #process.MessageLogger.cout = cms.untracked.PSet( #threshold = cms.untracked.string('ERROR'), @@ -93,7 +93,7 @@ #) # ) -# process.MessageLogger.categories = ['Status', 'Parameter'] +# # # copy stdout to a file #process.MessageLogger.detailedInfo = process.MessageLogger.cout # process.MessageLogger.debugModules = ['hltResults'] diff --git a/DQMOffline/Hcal/test/hcalCollapseAnalyzer_cfg.py b/DQMOffline/Hcal/test/hcalCollapseAnalyzer_cfg.py index 0c4c8a9622c5d..7acfbf1a3f1dd 100644 --- a/DQMOffline/Hcal/test/hcalCollapseAnalyzer_cfg.py +++ b/DQMOffline/Hcal/test/hcalCollapseAnalyzer_cfg.py @@ -6,8 +6,8 @@ process.load('Configuration.Geometry.GeometryExtended2018Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Collapse') + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('file:step311.root'), diff --git a/DQMOffline/Trigger/test/FSQtestDQM.py b/DQMOffline/Trigger/test/FSQtestDQM.py index d117bd957eeba..b7c38e7e23ff5 100644 --- a/DQMOffline/Trigger/test/FSQtestDQM.py +++ b/DQMOffline/Trigger/test/FSQtestDQM.py @@ -55,7 +55,7 @@ process.p = cms.Path(process.fsqHLTOfflineSource*process.fsqClient *process.dqmEnv*process.dqmSaver) #process.p = cms.Path(process.fsqHLTOfflineSourceSequence*process.fsqClient *process.dqmEnv*process.dqmSaver) #process.MessageLogger.threshold = cms.untracked.string( "INFO" ) -#process.MessageLogger.categories.append("FSQDiJetAve") +# ''' process.load("DQMOffline.Trigger.DQMOffline_Trigger_cff") process.load("DQMOffline.Trigger.FSQHLTOfflineClient_cfi") diff --git a/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py b/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py index c34f3bbfe6a9d..6f6219e078f3f 100644 --- a/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py +++ b/DQMOffline/Trigger/test/HLTTauOfflineDQMTest_cfg.py @@ -19,7 +19,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 -process.MessageLogger.categories.append("HLTTauDQMOffline") + process.load("Configuration.StandardSequences.GeometryRecoDB_cff") process.load("Geometry.CaloEventSetup.CaloTopology_cfi") diff --git a/DQMOffline/Trigger/test/triggerSequenceTest_cfg.py b/DQMOffline/Trigger/test/triggerSequenceTest_cfg.py index 96f5ea4d80167..804b311118495 100644 --- a/DQMOffline/Trigger/test/triggerSequenceTest_cfg.py +++ b/DQMOffline/Trigger/test/triggerSequenceTest_cfg.py @@ -76,7 +76,7 @@ # # Message Logger # process.load("FWCore.MessageService.MessageLogger_cfi") -# #process.MessageLogger.categories = ['hltFiltersDQMonitor'] +# # # process.MessageLogger.destinations = ['cout', 'detailedInfo', 'critical'] # process.MessageLogger.cout = cms.untracked.PSet( # #threshold = cms.untracked.string('ERROR'), @@ -89,7 +89,7 @@ # limit = cms.untracked.int32(-1) ## DEBUG, all messages # ) # ) -# process.MessageLogger.categories = ['Status', 'Parameter'] +# # # copy stdout to a file # process.MessageLogger.detailedInfo = process.MessageLogger.cout # process.MessageLogger.debugModules = ['hltFiltersDQMonitor'] diff --git a/DetectorDescription/OfflineDBLoader/test/dumpGeom_cfg.py b/DetectorDescription/OfflineDBLoader/test/dumpGeom_cfg.py index cf7f5996349e5..2024bb44426f1 100644 --- a/DetectorDescription/OfflineDBLoader/test/dumpGeom_cfg.py +++ b/DetectorDescription/OfflineDBLoader/test/dumpGeom_cfg.py @@ -9,8 +9,8 @@ process.load("Configuration.Geometry.GeometryExtended2026D49_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.source = cms.Source("EmptySource") diff --git a/ElectroWeakAnalysis/Utilities/test/SimpleSystematicsAnalyzer.py b/ElectroWeakAnalysis/Utilities/test/SimpleSystematicsAnalyzer.py index e0317b6d6679c..4a99374343a41 100644 --- a/ElectroWeakAnalysis/Utilities/test/SimpleSystematicsAnalyzer.py +++ b/ElectroWeakAnalysis/Utilities/test/SimpleSystematicsAnalyzer.py @@ -11,8 +11,9 @@ # Printouts process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout'] +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), FwkReport = cms.untracked.PSet(reportEvery=cms.untracked.int32(100)) ) diff --git a/EventFilter/CSCRawToDigi/test/testCSCDigi2Raw_cfg.py b/EventFilter/CSCRawToDigi/test/testCSCDigi2Raw_cfg.py index a724408d6a697..194d25e01fed4 100644 --- a/EventFilter/CSCRawToDigi/test/testCSCDigi2Raw_cfg.py +++ b/EventFilter/CSCRawToDigi/test/testCSCDigi2Raw_cfg.py @@ -48,11 +48,12 @@ process.DQMStore = cms.Service("DQMStore") # customize messagelogger -process.MessageLogger.destinations = cms.untracked.vstring('cout') +process.MessageLogger.cerr.enable = False process.MessageLogger.debugModules = cms.untracked.vstring('muonCSCDigis') ## categories: 'CSCDCCUnpacker|CSCRawToDigi', 'StatusDigis', 'StatusDigi', 'CSCRawToDigi', 'CSCDCCUnpacker', 'EventInfo', -process.MessageLogger.categories = cms.untracked.vstring("CSCDDUEventData|CSCRawToDigi", 'badData') + process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/EventFilter/CSCTFRawToDigi/test/analyzer.py b/EventFilter/CSCTFRawToDigi/test/analyzer.py index 1a9b25bcd3947..0dde3feda34ab 100644 --- a/EventFilter/CSCTFRawToDigi/test/analyzer.py +++ b/EventFilter/CSCTFRawToDigi/test/analyzer.py @@ -7,7 +7,7 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/EventFilter/CSCTFRawToDigi/test/data.py b/EventFilter/CSCTFRawToDigi/test/data.py index d6e25b2ab2ed9..73b50a89dff0b 100644 --- a/EventFilter/CSCTFRawToDigi/test/data.py +++ b/EventFilter/CSCTFRawToDigi/test/data.py @@ -7,7 +7,7 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/EventFilter/CSCTFRawToDigi/test/testCSCTFRawToDigi_cfg.py b/EventFilter/CSCTFRawToDigi/test/testCSCTFRawToDigi_cfg.py index fd2db13aee393..4821703cc05bb 100644 --- a/EventFilter/CSCTFRawToDigi/test/testCSCTFRawToDigi_cfg.py +++ b/EventFilter/CSCTFRawToDigi/test/testCSCTFRawToDigi_cfg.py @@ -4,7 +4,7 @@ process.load('EventFilter.CSCTFRawToDigi.csctfpacker_cfi') process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(128) ) process.load('FWCore.MessageLogger.MessageLogger_cfi') -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') process.source = cms.Source('EmptySource') diff --git a/EventFilter/GEMRawToDigi/test/unpackData-GEM.py b/EventFilter/GEMRawToDigi/test/unpackData-GEM.py index cbff040284099..7e8f06bc7d057 100644 --- a/EventFilter/GEMRawToDigi/test/unpackData-GEM.py +++ b/EventFilter/GEMRawToDigi/test/unpackData-GEM.py @@ -121,11 +121,10 @@ process.load("CommonTools.UtilAlgos.TFileService_cfi") # enable debug message logging for our modules -#process.MessageLogger.categories.append('L1TCaloEvents') +# if (options.dumpRaw): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet(INFO = cms.untracked.PSet(limit = cms.untracked.int32(0))) + process.MessageLogger.files.infos = cms.untracked.PSet(INFO = cms.untracked.PSet(limit = cms.untracked.int32(0))) if (options.debug): # process.MessageLogger.debugModules = cms.untracked.vstring('L1TRawToDigi:caloStage2Digis', 'MP7BufferDumpToRaw:stage2MPRaw', 'MP7BufferDumpToRaw:stage2DemuxRaw') diff --git a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmPacker_cfg.py b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmPacker_cfg.py index d8747a03378f1..5af68fba017ac 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmPacker_cfg.py +++ b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmPacker_cfg.py @@ -329,8 +329,8 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtEvmPack'] -process.MessageLogger.destinations = ['L1GtEvmPacker'] -process.MessageLogger.L1GtEvmPacker = cms.untracked.PSet( +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.L1GtEvmPacker = cms.untracked.PSet( threshold=cms.untracked.string('DEBUG'), #threshold = cms.untracked.string('INFO'), #threshold = cms.untracked.string('ERROR'), diff --git a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmUnpacker_cfg.py b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmUnpacker_cfg.py index 23880badb1607..cda251f9fe119 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmUnpacker_cfg.py +++ b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtEvmUnpacker_cfg.py @@ -88,29 +88,24 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtEvmUnpack', 'l1GtTrigReport'] -process.MessageLogger.categories.append('L1GlobalTriggerEvmRawToDigi') -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.destinations = ['L1GtEvmUnpacker_errors', - 'L1GtEvmUnpacker_warnings', - 'L1GtEvmUnpacker_info', - 'L1GtEvmUnpacker' - ] -process.MessageLogger.statistics = [] - -process.MessageLogger.L1GtEvmUnpacker_errors = cms.untracked.PSet( + + +process.MessageLogger.cerr.enable = False + +process.MessageLogger.files.L1GtEvmUnpacker_errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GlobalTriggerEvmRawToDigi = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtEvmUnpacker_warnings = cms.untracked.PSet( +process.MessageLogger.files.L1GtEvmUnpacker_warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), L1GlobalTriggerEvmRawToDigi = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtEvmUnpacker_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtEvmUnpacker_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -118,7 +113,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtEvmUnpacker = cms.untracked.PSet( +process.MessageLogger.files.L1GtEvmUnpacker = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtPacker_cfg.py b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtPacker_cfg.py index 3645557e81e6b..7c899940ced11 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtPacker_cfg.py +++ b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtPacker_cfg.py @@ -331,8 +331,8 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtPack'] -process.MessageLogger.destinations = ['L1GtPacker'] -process.MessageLogger.L1GtPacker = cms.untracked.PSet( +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.L1GtPacker = cms.untracked.PSet( threshold=cms.untracked.string('DEBUG'), #threshold = cms.untracked.string('INFO'), #threshold = cms.untracked.string('ERROR'), diff --git a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtRecord_cfg.py b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtRecord_cfg.py index 5951c18d0d166..2d4e29f6bc300 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtRecord_cfg.py +++ b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtRecord_cfg.py @@ -427,15 +427,14 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtRecord'] -process.MessageLogger.categories.append('L1GlobalTriggerRecord') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.MessageLogger.cerr.default.limit = 0 process.MessageLogger.cerr.FwkReport.limit = 0 process.MessageLogger.cerr.FwkSummary.limit = 0 -process.MessageLogger.destinations.extend('debugs', 'warnings', 'errors') -process.MessageLogger.debugs = cms.untracked.PSet( +process.MessageLogger.files.debugs = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -445,7 +444,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.warnings = cms.untracked.PSet( +process.MessageLogger.files.warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -453,7 +452,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.errors = cms.untracked.PSet( +process.MessageLogger.files.errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GlobalTriggerRecord = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtTriggerMenuLite_cfg.py b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtTriggerMenuLite_cfg.py index 43f2db6f6309f..aa42e797a4951 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtTriggerMenuLite_cfg.py +++ b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtTriggerMenuLite_cfg.py @@ -56,14 +56,13 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtTriggerMenuLite'] -process.MessageLogger.categories.append('L1GtTriggerMenuLiteProducer') + process.MessageLogger.cerr.default.limit = 0 process.MessageLogger.cerr.FwkReport.limit = 0 process.MessageLogger.cerr.FwkSummary.limit = 0 -process.MessageLogger.destinations.extend('debugs', 'warnings', 'errors') -process.MessageLogger.debugs = cms.untracked.PSet( +process.MessageLogger.files.debugs = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -72,14 +71,14 @@ L1GtTriggerMenuLiteProducer = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.warnings = cms.untracked.PSet( +process.MessageLogger.files.warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), L1GtTriggerMenuLiteProducer = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.errors = cms.untracked.PSet( +process.MessageLogger.files.errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GtTriggerMenuLiteProducer = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtUnpacker_cfg.py b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtUnpacker_cfg.py index 5527f4db5f56e..868f275ac12c6 100644 --- a/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtUnpacker_cfg.py +++ b/EventFilter/L1GlobalTriggerRawToDigi/test/L1GtUnpacker_cfg.py @@ -118,29 +118,24 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtUnpack', 'l1GtTrigReport'] -process.MessageLogger.categories.append('L1GlobalTriggerRawToDigi') -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.destinations = ['L1GtUnpacker_errors', - 'L1GtUnpacker_warnings', - 'L1GtUnpacker_info', - 'L1GtUnpacker' - ] -process.MessageLogger.statistics = [] - -process.MessageLogger.L1GtUnpacker_errors = cms.untracked.PSet( + + +process.MessageLogger.cerr.enable = False + +process.MessageLogger.files.L1GtUnpacker_errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GlobalTriggerRawToDigi = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtUnpacker_warnings = cms.untracked.PSet( +process.MessageLogger.files.L1GtUnpacker_warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), L1GlobalTriggerRawToDigi = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtUnpacker_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtUnpacker_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -148,7 +143,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtUnpacker = cms.untracked.PSet( +process.MessageLogger.files.L1GtUnpacker = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/EventFilter/L1TRawToDigi/utils/unpackBuffers-CaloStage2.py b/EventFilter/L1TRawToDigi/utils/unpackBuffers-CaloStage2.py index 017e7af276310..d0a20b1c4e5e5 100644 --- a/EventFilter/L1TRawToDigi/utils/unpackBuffers-CaloStage2.py +++ b/EventFilter/L1TRawToDigi/utils/unpackBuffers-CaloStage2.py @@ -160,16 +160,14 @@ # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dump): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet(placeholder = cms.untracked.bool(False), + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage1.py b/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage1.py index b8bd61ee8b615..f19f4d142f274 100644 --- a/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage1.py +++ b/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage1.py @@ -92,14 +92,12 @@ # enable debug message logging for our modules process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append('L1TCaloEvents') + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dumpRaw or options.dumpDigis): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet(placeholder = cms.untracked.bool(False), + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage2.py b/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage2.py index 2076ad80dbffd..5bbdb1277500e 100644 --- a/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage2.py +++ b/EventFilter/L1TRawToDigi/utils/unpackData-CaloStage2.py @@ -122,16 +122,14 @@ process.TFileService.fileName = cms.string('l1tCalo_2016_histos.root') # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dumpRaw): - process.Messagelogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet( + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/FWCore/Integration/test/AssociationMapReadTest_cfg.py b/FWCore/Integration/test/AssociationMapReadTest_cfg.py index 5837e26ada95e..0f6bdeaad15f0 100644 --- a/FWCore/Integration/test/AssociationMapReadTest_cfg.py +++ b/FWCore/Integration/test/AssociationMapReadTest_cfg.py @@ -3,8 +3,8 @@ process = cms.Process("READ") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") diff --git a/FWCore/Integration/test/AssociationMapTest_cfg.py b/FWCore/Integration/test/AssociationMapTest_cfg.py index e5cb3bed77577..010847ac68d3c 100644 --- a/FWCore/Integration/test/AssociationMapTest_cfg.py +++ b/FWCore/Integration/test/AssociationMapTest_cfg.py @@ -3,8 +3,8 @@ process = cms.Process("PROD") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.load("FWCore.Framework.test.cmsExceptionsFatal_cff") diff --git a/FWCore/Integration/test/RefTest_cfg.py b/FWCore/Integration/test/RefTest_cfg.py index 121c34f1a6eb2..b7923c1fdd5f1 100644 --- a/FWCore/Integration/test/RefTest_cfg.py +++ b/FWCore/Integration/test/RefTest_cfg.py @@ -7,8 +7,8 @@ # The following two lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet( diff --git a/FWCore/Integration/test/TransRefTest_cfg.py b/FWCore/Integration/test/TransRefTest_cfg.py index d0934fa91f096..d3ba3ef22d2f3 100644 --- a/FWCore/Integration/test/TransRefTest_cfg.py +++ b/FWCore/Integration/test/TransRefTest_cfg.py @@ -7,8 +7,8 @@ # The following two lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet( diff --git a/FWCore/Integration/test/ViewTest_cfg.py b/FWCore/Integration/test/ViewTest_cfg.py index 81fa79af3a989..7586a5eee64ab 100644 --- a/FWCore/Integration/test/ViewTest_cfg.py +++ b/FWCore/Integration/test/ViewTest_cfg.py @@ -7,8 +7,8 @@ # The following two lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet( diff --git a/FWCore/Integration/test/parentlessTest_cfg.py b/FWCore/Integration/test/parentlessTest_cfg.py index 63359241a086c..d758e1c010fd8 100644 --- a/FWCore/Integration/test/parentlessTest_cfg.py +++ b/FWCore/Integration/test/parentlessTest_cfg.py @@ -7,8 +7,8 @@ # The following two lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet( diff --git a/FWCore/MessageService/python/MessageLogger_ReleaseValidation_cfi.py b/FWCore/MessageService/python/MessageLogger_ReleaseValidation_cfi.py index fb246309a348e..abde18ba97de8 100644 --- a/FWCore/MessageService/python/MessageLogger_ReleaseValidation_cfi.py +++ b/FWCore/MessageService/python/MessageLogger_ReleaseValidation_cfi.py @@ -1,16 +1,67 @@ import FWCore.ParameterSet.Config as cms +_category = cms.optional.untracked.PSetTemplate( + reportEvery = cms.untracked.int32(1), + limit = cms.optional.untracked.int32, + timespan = cms.optional.untracked.int32 +) + +_destination_base = cms.untracked.PSet( + noLineBreaks = cms.optional.untracked.bool, + noTimeStamps = cms.optional.untracked.bool, + lineLength = cms.optional.untracked.int32, + threshold = cms.optional.untracked.string, + statisticsThreshold = cms.optional.untracked.string, + allowAnyLabel_ = _category +) +_destination_no_stat = _destination_base.clone( + enableStatistics = cms.untracked.bool(False), + resetStatistics = cms.untracked.bool(False) +) + +_file_destination = cms.optional.untracked.PSetTemplate( + noLineBreaks = cms.optional.untracked.bool, + noTimeStamps = cms.optional.untracked.bool, + lineLength = cms.optional.untracked.int32, + threshold = cms.optional.untracked.string, + statisticsThreshold = cms.optional.untracked.string, + enableStatistics = cms.untracked.bool(False), + resetStatistics = cms.untracked.bool(False), + filename = cms.optional.untracked.string, + extension = cms.optional.untracked.string, + output = cms.optional.untracked.string, + allowAnyLabel_ = _category +) + +_default_pset = cms.untracked.PSet( + reportEvery = cms.untracked.int32(1), + limit = cms.optional.untracked.int32, + timespan = cms.optional.untracked.int32, + + noLineBreaks = cms.untracked.bool(False), + noTimeStamps = cms.untracked.bool(False), + lineLength = cms.untracked.int32(80), + threshold = cms.untracked.string("INFO"), + statisticsThreshold = cms.untracked.string("INFO"), + allowAnyLabel_ = _category +) + + MessageLogger = cms.Service("MessageLogger", - suppressInfo = cms.untracked.vstring(), + suppressWarning = cms.untracked.vstring(), suppressFwkInfo = cms.untracked.vstring(), + suppressInfo = cms.untracked.vstring(), suppressDebug = cms.untracked.vstring(), - cout = cms.untracked.PSet( - placeholder = cms.untracked.bool(True) - ), - default = cms.untracked.PSet( - - ), - cerr = cms.untracked.PSet( + debugModules = cms.untracked.vstring(), + cout = _destination_no_stat.clone( + enable = cms.untracked.bool(False) + ), + default = _default_pset.clone(), + cerr = _destination_base.clone( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), + resetStatistics = cms.untracked.bool(False), + statisticsThreshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(5) ), @@ -31,19 +82,10 @@ ), threshold = cms.untracked.string('INFO') ), - suppressWarning = cms.untracked.vstring(), - statistics = cms.untracked.vstring('cerr_stats'), - cerr_stats = cms.untracked.PSet( - threshold = cms.untracked.string('INFO'), - output = cms.untracked.string('cerr') + files = cms.untracked.PSet( + allowAnyLabel_ = _file_destination ), - destinations = cms.untracked.vstring( - 'cout', - 'cerr'), - debugModules = cms.untracked.vstring(), - categories = cms.untracked.vstring('FwkReport', - 'FwkSummary', - 'Root_NoDictionary') + allowAnyLabel_ = _category ) diff --git a/FWCore/MessageService/python/MessageLogger_cfi.py b/FWCore/MessageService/python/MessageLogger_cfi.py index 6cbc7f24e17d7..88fa79fac2eb5 100644 --- a/FWCore/MessageService/python/MessageLogger_cfi.py +++ b/FWCore/MessageService/python/MessageLogger_cfi.py @@ -1,23 +1,72 @@ import FWCore.ParameterSet.Config as cms +_category = cms.optional.untracked.PSetTemplate( + reportEvery = cms.untracked.int32(1), + limit = cms.optional.untracked.int32, + timespan = cms.optional.untracked.int32 +) + +_destination_base = cms.untracked.PSet( + noLineBreaks = cms.optional.untracked.bool, + noTimeStamps = cms.optional.untracked.bool, + lineLength = cms.optional.untracked.int32, + threshold = cms.optional.untracked.string, + statisticsThreshold = cms.optional.untracked.string, + allowAnyLabel_ = _category +) +_destination_no_stat = _destination_base.clone( + enableStatistics = cms.untracked.bool(False), + resetStatistics = cms.untracked.bool(False) +) + +_file_destination = cms.optional.untracked.PSetTemplate( + noLineBreaks = cms.optional.untracked.bool, + noTimeStamps = cms.optional.untracked.bool, + lineLength = cms.optional.untracked.int32, + threshold = cms.optional.untracked.string, + statisticsThreshold = cms.optional.untracked.string, + enableStatistics = cms.untracked.bool(False), + resetStatistics = cms.untracked.bool(False), + filename = cms.optional.untracked.string, + extension = cms.optional.untracked.string, + output = cms.optional.untracked.string, + allowAnyLabel_ = _category +) + +_default_pset = cms.untracked.PSet( + reportEvery = cms.untracked.int32(1), + limit = cms.optional.untracked.int32, + timespan = cms.optional.untracked.int32, + + noLineBreaks = cms.untracked.bool(False), + noTimeStamps = cms.untracked.bool(False), + lineLength = cms.untracked.int32(80), + threshold = cms.untracked.string("INFO"), + statisticsThreshold = cms.untracked.string("INFO"), + allowAnyLabel_ = _category +) + + MessageLogger = cms.Service("MessageLogger", - suppressInfo = cms.untracked.vstring(), + suppressWarning = cms.untracked.vstring(), suppressFwkInfo = cms.untracked.vstring(), + suppressInfo = cms.untracked.vstring(), suppressDebug = cms.untracked.vstring(), - cout = cms.untracked.PSet( - placeholder = cms.untracked.bool(True) - ), - default = cms.untracked.PSet( - - ), - cerr = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), + debugModules = cms.untracked.vstring(), + cout = _destination_no_stat.clone( + enable = cms.untracked.bool(False) + ), + default = _default_pset.clone(), + cerr = _destination_base.clone( + enable = cms.untracked.bool(True), + enableStatistics = cms.untracked.bool(True), + resetStatistics = cms.untracked.bool(False), + statisticsThreshold = cms.untracked.string('WARNING'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), noTimeStamps = cms.untracked.bool(False), FwkReport = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), reportEvery = cms.untracked.int32(1), limit = cms.untracked.int32(10000000) ), @@ -25,30 +74,18 @@ limit = cms.untracked.int32(10000000) ), Root_NoDictionary = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(0) ), FwkSummary = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), reportEvery = cms.untracked.int32(1), limit = cms.untracked.int32(10000000) ), threshold = cms.untracked.string('INFO') ), - suppressWarning = cms.untracked.vstring(), - statistics = cms.untracked.vstring('cerr_stats'), - cerr_stats = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), - threshold = cms.untracked.string('WARNING'), - output = cms.untracked.string('cerr') + files = cms.untracked.PSet( + allowAnyLabel_ = _file_destination ), - destinations = cms.untracked.vstring( - 'cout', - 'cerr'), - debugModules = cms.untracked.vstring(), - categories = cms.untracked.vstring('FwkReport', - 'FwkSummary', - 'Root_NoDictionary') + allowAnyLabel_ = _category ) diff --git a/FWCore/MessageService/test/t1_cfg.py b/FWCore/MessageService/test/t1_cfg.py index ecdd8b88a944f..da59a29746137 100644 --- a/FWCore/MessageService/test/t1_cfg.py +++ b/FWCore/MessageService/test/t1_cfg.py @@ -12,7 +12,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('expect_specific') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32( 0) ), diff --git a/FWCore/MessageService/test/t2_cfg.py b/FWCore/MessageService/test/t2_cfg.py index 7da461c367c8f..6cadd7e5f4422 100644 --- a/FWCore/MessageService/test/t2_cfg.py +++ b/FWCore/MessageService/test/t2_cfg.py @@ -12,7 +12,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('expect_specific') + process.MessageLogger.cerr.TtSemiLeptonicEvent = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/FWCore/MessageService/test/u32_cfg.py b/FWCore/MessageService/test/u32_cfg.py index 7c6b4af071edf..2a4a6cbbdf2a1 100644 --- a/FWCore/MessageService/test/u32_cfg.py +++ b/FWCore/MessageService/test/u32_cfg.py @@ -14,13 +14,12 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations.append('errors') -process.MessageLogger.errors = cms.untracked.PSet( - threshold = cms.untracked.string('ERROR'), +process.MessageLogger.files.errors = dict( + threshold = 'ERROR', default = cms.untracked.PSet( limit = cms.untracked.int32(3) ), - noTimeStamps = cms.untracked.bool(True) + noTimeStamps = True ) process.maxEvents = cms.untracked.PSet( diff --git a/FWCore/MessageService/test/u9_cfg.py b/FWCore/MessageService/test/u9_cfg.py index da849f501641d..c4bf8b418a861 100644 --- a/FWCore/MessageService/test/u9_cfg.py +++ b/FWCore/MessageService/test/u9_cfg.py @@ -12,9 +12,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['warnings', 'infos'] -del process.MessageLogger.statistics -process.MessageLogger.categories.append('FwkTest') +process.MessageLogger.cerr.enableStatistics = False + process.MessageLogger.default = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(False), FwkTest = cms.untracked.PSet( @@ -22,7 +21,7 @@ ), limit = cms.untracked.int32(-1) ) -process.MessageLogger.warnings = cms.untracked.PSet( +process.MessageLogger.files.warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), enableStatistics = cms.untracked.bool(True), default = cms.untracked.PSet( @@ -30,7 +29,7 @@ ), noTimeStamps = cms.untracked.bool(True) ) -process.MessageLogger.infos = cms.untracked.PSet( +process.MessageLogger.files.infos = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(2) ), diff --git a/FWCore/Services/bin/edmTracerLogToSimpleConfig.py b/FWCore/Services/bin/edmTracerLogToSimpleConfig.py index 106bece31b75f..eb4e1faaa2b7b 100644 --- a/FWCore/Services/bin/edmTracerLogToSimpleConfig.py +++ b/FWCore/Services/bin/edmTracerLogToSimpleConfig.py @@ -120,8 +120,8 @@ def finish(self): # The following two lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.MessageLogger.cerr.FwkReport.reportEvery = 50000 process.MessageLogger.cerr.threshold = 'WARNING' diff --git a/FastSimulation/ForwardDetectors/test/CastorTowerProducerTest_cfg.py b/FastSimulation/ForwardDetectors/test/CastorTowerProducerTest_cfg.py index 376745c047a88..c55d4a4bf1157 100644 --- a/FastSimulation/ForwardDetectors/test/CastorTowerProducerTest_cfg.py +++ b/FastSimulation/ForwardDetectors/test/CastorTowerProducerTest_cfg.py @@ -71,7 +71,7 @@ #process.Timing = cms.Service("Timing") #process.load("FWCore/MessageService/MessageLogger_cfi") #process.MessageLogger.destinations = cms.untracked.vstring("pyDetailedInfo.txt","cout") -#process.MessageLogger.categories.append("FamosManager") +# #process.MessageLogger.cout = cms.untracked.PSet(threshold=cms.untracked.string("INFO"), # default=cms.untracked.PSet(limit=cms.untracked.int32(0)), # FamosManager=cms.untracked.PSet(limit=cms.untracked.int32(100000))) diff --git a/FastSimulation/MaterialEffects/test/NITemplate_cfg.py b/FastSimulation/MaterialEffects/test/NITemplate_cfg.py index 2cf85b6f42f68..353d156f29e2b 100644 --- a/FastSimulation/MaterialEffects/test/NITemplate_cfg.py +++ b/FastSimulation/MaterialEffects/test/NITemplate_cfg.py @@ -68,6 +68,6 @@ # Keep the logging output to a nice level # process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['detailedInfo.txt'] - +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo = dict(extension = 'txt') diff --git a/FastSimulation/MaterialEffects/test/testMaterialEffects_cfg.py b/FastSimulation/MaterialEffects/test/testMaterialEffects_cfg.py index f2780b47b3009..6c6df57ffceed 100644 --- a/FastSimulation/MaterialEffects/test/testMaterialEffects_cfg.py +++ b/FastSimulation/MaterialEffects/test/testMaterialEffects_cfg.py @@ -183,5 +183,6 @@ # Keep the logging output to a nice level # process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['detailedInfo.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo= dict(extension='.txt') diff --git a/FastSimulation/MaterialEffects/test/testNuclearInteractions_cfg.py b/FastSimulation/MaterialEffects/test/testNuclearInteractions_cfg.py index 8a1dceaa24a5c..d943cf13d1bba 100644 --- a/FastSimulation/MaterialEffects/test/testNuclearInteractions_cfg.py +++ b/FastSimulation/MaterialEffects/test/testNuclearInteractions_cfg.py @@ -136,7 +136,7 @@ # Charged particles with pT < pTMin (GeV/c) are not simulated pTMin = cms.double(0.0), # Particles with energy smaller than EMin (GeV) are not simulated - EMin = cms.double(0.0) + EMin = cms.double(0.0), # Protons with energy in excess of this value (GeV) will kept no matter what EProton = cms.double(99999.0), ) @@ -168,6 +168,7 @@ # Keep the logging output to a nice level # process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['test.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.test = dict(extension = 'txt') diff --git a/FastSimulation/Tracking/test/beamspot/BeamSpotCalculator_cfg.py b/FastSimulation/Tracking/test/beamspot/BeamSpotCalculator_cfg.py index 1657174bb9e87..baf602b0c5b3a 100644 --- a/FastSimulation/Tracking/test/beamspot/BeamSpotCalculator_cfg.py +++ b/FastSimulation/Tracking/test/beamspot/BeamSpotCalculator_cfg.py @@ -74,7 +74,8 @@ # Keep output to a nice level # process.Timing = cms.Service("Timing") process.load("FWCore/MessageService/MessageLogger_cfi") -process.MessageLogger.destinations = cms.untracked.vstring("pyDetailedInfo.txt") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.pyDetailedInfo=dict(extension="txt") # Make the job crash in case of missing product process.options = cms.untracked.PSet( Rethrow = cms.untracked.vstring('ProductNotFound') ) diff --git a/FastSimulation/Tracking/test/testGeneralTracks_cfg.py b/FastSimulation/Tracking/test/testGeneralTracks_cfg.py index 31c15197cf126..b0373aefd9824 100644 --- a/FastSimulation/Tracking/test/testGeneralTracks_cfg.py +++ b/FastSimulation/Tracking/test/testGeneralTracks_cfg.py @@ -109,7 +109,8 @@ # Keep the logging output to a nice level # process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['test.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.test = dict(extension = 'txt') # Should be commented out in the analysis step process.o1 = cms.OutputModule( diff --git a/FastSimulation/Validation/test/SingleElectronAnalyzer-full_cfg.py b/FastSimulation/Validation/test/SingleElectronAnalyzer-full_cfg.py index 65e7e8a7822f2..b79691696ddc7 100644 --- a/FastSimulation/Validation/test/SingleElectronAnalyzer-full_cfg.py +++ b/FastSimulation/Validation/test/SingleElectronAnalyzer-full_cfg.py @@ -68,6 +68,7 @@ process.Timing = cms.Service("Timing") process.p1 = cms.Path(process.gsfElectronAnalysis) -process.MessageLogger.destinations = ['detailedInfo.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo = dict(extension='txt') diff --git a/FastSimulation/Validation/test/SingleElectronAnalyzer_cfg.py b/FastSimulation/Validation/test/SingleElectronAnalyzer_cfg.py index fa7eb70003e33..fe33c66eb4f64 100644 --- a/FastSimulation/Validation/test/SingleElectronAnalyzer_cfg.py +++ b/FastSimulation/Validation/test/SingleElectronAnalyzer_cfg.py @@ -111,6 +111,7 @@ layer.interactionModels = cms.untracked.vstring("pairProduction", "nuclearInteraction", "bremsstrahlung", "energyLoss", "multipleScattering", "trackerSimHits") for layer in process.fastSimProducer.detectorDefinition.ForwardLayers: layer.interactionModels = cms.untracked.vstring("pairProduction", "nuclearInteraction", "bremsstrahlung", "energyLoss", "multipleScattering", "trackerSimHits") -process.MessageLogger.destinations = ['detailedInfo.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo=dict(extension='txt') diff --git a/FastSimulation/Validation/test/checkTiming.sh b/FastSimulation/Validation/test/checkTiming.sh index 40c1419015f9b..fb03350287389 100755 --- a/FastSimulation/Validation/test/checkTiming.sh +++ b/FastSimulation/Validation/test/checkTiming.sh @@ -11,7 +11,8 @@ else fi echo 'process.Timing = cms.Service("Timing")' >> IntegrationTestWithHLTWithTiming_cfg.py echo 'process.load("FWCore/MessageService/MessageLogger_cfi")' >> IntegrationTestWithHLTWithTiming_cfg.py -echo 'process.MessageLogger.destinations = cms.untracked.vstring("pyDetailedInfo.txt")' >> IntegrationTestWithHLTWithTiming_cfg.py +echo 'process.MessageLogger.cerr.enable = False' >> IntegrationTestWithHLTWithTiming_cfg.py +echo 'process.MessageLogger.files.pyDetailedInfo = dict(extension = "txt")' >> IntegrationTestWithHLTWithTiming_cfg.py # build the binary oval b diff --git a/FastSimulation/Validation/test/runJetPlotFast_cfg.py b/FastSimulation/Validation/test/runJetPlotFast_cfg.py index b53e19dd6e6a2..e54b67c4b8b61 100644 --- a/FastSimulation/Validation/test/runJetPlotFast_cfg.py +++ b/FastSimulation/Validation/test/runJetPlotFast_cfg.py @@ -50,6 +50,7 @@ layer.interactionModels = cms.untracked.vstring("pairProduction", "nuclearInteraction", "bremsstrahlung", "energyLoss", "multipleScattering", "trackerSimHits") for layer in process.fastSimProducer.detectorDefinition.ForwardLayers: layer.interactionModels = cms.untracked.vstring("pairProduction", "nuclearInteraction", "bremsstrahlung", "energyLoss", "multipleScattering", "trackerSimHits") -process.MessageLogger.destinations = ['detailedInfo.txt'] +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo = dict(extension = '.txt') diff --git a/GeneratorInterface/ExternalDecays/test/Py6EvtGenFilter_cfg.py b/GeneratorInterface/ExternalDecays/test/Py6EvtGenFilter_cfg.py index ede491450e894..524e261b98a74 100644 --- a/GeneratorInterface/ExternalDecays/test/Py6EvtGenFilter_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py6EvtGenFilter_cfg.py @@ -14,8 +14,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(500)) diff --git a/GeneratorInterface/ExternalDecays/test/Py6GenFilter_Photos_cfg.py b/GeneratorInterface/ExternalDecays/test/Py6GenFilter_Photos_cfg.py index 759eeb5ba7444..8d171f018c170 100644 --- a/GeneratorInterface/ExternalDecays/test/Py6GenFilter_Photos_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py6GenFilter_Photos_cfg.py @@ -23,8 +23,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(20)) diff --git a/GeneratorInterface/ExternalDecays/test/Py6GenFilter_W2TauNu_Tauola_cfg.py b/GeneratorInterface/ExternalDecays/test/Py6GenFilter_W2TauNu_Tauola_cfg.py index 70ea3183896b1..634acd329d95c 100644 --- a/GeneratorInterface/ExternalDecays/test/Py6GenFilter_W2TauNu_Tauola_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py6GenFilter_W2TauNu_Tauola_cfg.py @@ -27,8 +27,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5)) diff --git a/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Onia_EvtGen_cfg.py b/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Onia_EvtGen_cfg.py index a19f5bfd79f43..813ba78f2bcc8 100644 --- a/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Onia_EvtGen_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Onia_EvtGen_cfg.py @@ -68,8 +68,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", diff --git a/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Photos_cfg.py b/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Photos_cfg.py index 0321b3a54f78e..4aab273830836 100644 --- a/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Photos_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py8GenFilter_Photos_cfg.py @@ -61,8 +61,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", diff --git a/GeneratorInterface/ExternalDecays/test/Py8GenFilter_W2TauNu_Tauola_cfg.py b/GeneratorInterface/ExternalDecays/test/Py8GenFilter_W2TauNu_Tauola_cfg.py index b47fbf0361f87..0f25b3b5ad04f 100644 --- a/GeneratorInterface/ExternalDecays/test/Py8GenFilter_W2TauNu_Tauola_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py8GenFilter_W2TauNu_Tauola_cfg.py @@ -74,8 +74,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", diff --git a/GeneratorInterface/ExternalDecays/test/Py8_Z2tautau_tauolacxx_cfg.py b/GeneratorInterface/ExternalDecays/test/Py8_Z2tautau_tauolacxx_cfg.py index 4a73cd921926a..933e0a1f06e7e 100644 --- a/GeneratorInterface/ExternalDecays/test/Py8_Z2tautau_tauolacxx_cfg.py +++ b/GeneratorInterface/ExternalDecays/test/Py8_Z2tautau_tauolacxx_cfg.py @@ -75,8 +75,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.RandomNumberGeneratorService = cms.Service("RandomNumberGeneratorService", diff --git a/GeneratorInterface/ExternalDecays/test/TauSpinnerWTest.py b/GeneratorInterface/ExternalDecays/test/TauSpinnerWTest.py index 9e48e5d243397..7437aeb6f4381 100644 --- a/GeneratorInterface/ExternalDecays/test/TauSpinnerWTest.py +++ b/GeneratorInterface/ExternalDecays/test/TauSpinnerWTest.py @@ -31,8 +31,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(100)) diff --git a/GeneratorInterface/ExternalDecays/test/TauSpinnerZTest.py b/GeneratorInterface/ExternalDecays/test/TauSpinnerZTest.py index ba33caac5a2a3..6bb08e027980b 100644 --- a/GeneratorInterface/ExternalDecays/test/TauSpinnerZTest.py +++ b/GeneratorInterface/ExternalDecays/test/TauSpinnerZTest.py @@ -24,8 +24,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(100)) diff --git a/GeneratorInterface/GenExtensions/test/EDDE_cfg.py b/GeneratorInterface/GenExtensions/test/EDDE_cfg.py index 309490a7d52f7..da7933661db60 100644 --- a/GeneratorInterface/GenExtensions/test/EDDE_cfg.py +++ b/GeneratorInterface/GenExtensions/test/EDDE_cfg.py @@ -22,8 +22,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(50)) diff --git a/GeneratorInterface/GenFilters/test/comphep_singletop_Py8.py b/GeneratorInterface/GenFilters/test/comphep_singletop_Py8.py index 963c67086b4f3..c2db21e38f894 100644 --- a/GeneratorInterface/GenFilters/test/comphep_singletop_Py8.py +++ b/GeneratorInterface/GenFilters/test/comphep_singletop_Py8.py @@ -16,8 +16,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -##process.MessageLogger.destinations = ['cerr'] -##process.MessageLogger.statistics = [] +## +##process.MessageLogger.cerr.enableStatistics = False ## ##process.MessageLogger.cerr.threshold = "Warning" diff --git a/GeneratorInterface/GenFilters/test/test_EMJetHeep_cfg.py b/GeneratorInterface/GenFilters/test/test_EMJetHeep_cfg.py index e2bfcd5c730a5..4c7b76ff1f101 100644 --- a/GeneratorInterface/GenFilters/test/test_EMJetHeep_cfg.py +++ b/GeneratorInterface/GenFilters/test/test_EMJetHeep_cfg.py @@ -24,8 +24,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.MessageLogger.cerr.threshold = "Warning" diff --git a/GeneratorInterface/GenFilters/test/test_EMJetMB_cfg.py b/GeneratorInterface/GenFilters/test/test_EMJetMB_cfg.py index bb5100b177d4f..0467fdd282842 100644 --- a/GeneratorInterface/GenFilters/test/test_EMJetMB_cfg.py +++ b/GeneratorInterface/GenFilters/test/test_EMJetMB_cfg.py @@ -24,8 +24,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.MessageLogger.cerr.threshold = "Warning" diff --git a/GeneratorInterface/GenFilters/test/test_isotrack_cfg.py b/GeneratorInterface/GenFilters/test/test_isotrack_cfg.py index af5d058a84dc0..7aa38dca46b53 100644 --- a/GeneratorInterface/GenFilters/test/test_isotrack_cfg.py +++ b/GeneratorInterface/GenFilters/test/test_isotrack_cfg.py @@ -17,7 +17,7 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('PythiaFilter') + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1000)) diff --git a/GeneratorInterface/Pythia6Interface/test/AlpgenSource_Py6Had_cfg.py b/GeneratorInterface/Pythia6Interface/test/AlpgenSource_Py6Had_cfg.py index 80cc75fc99a25..c39a1e6963884 100644 --- a/GeneratorInterface/Pythia6Interface/test/AlpgenSource_Py6Had_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/AlpgenSource_Py6Had_cfg.py @@ -26,8 +26,8 @@ ) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.generator = cms.EDFilter("Pythia6HadronizerFilter", diff --git a/GeneratorInterface/Pythia6Interface/test/Py6EvtGenFilter_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6EvtGenFilter_cfg.py index e3a35c3b447dc..de4065740f845 100755 --- a/GeneratorInterface/Pythia6Interface/test/Py6EvtGenFilter_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6EvtGenFilter_cfg.py @@ -14,8 +14,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(10)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_CSAMode_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_CSAMode_cfg.py index e01e74a8788c5..266f6b3dadd3c 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_CSAMode_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_CSAMode_cfg.py @@ -17,8 +17,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_ElectronProtonInitialState_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_ElectronProtonInitialState_cfg.py index b92792d727f65..ee041ad7af269 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_ElectronProtonInitialState_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_ElectronProtonInitialState_cfg.py @@ -16,8 +16,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + +process.MessageLogger.cerr.enableStatistics = False process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(20)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_EvtGenTest_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_EvtGenTest_cfg.py index 354193ee4b347..644c0628d6da8 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_EvtGenTest_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_EvtGenTest_cfg.py @@ -24,8 +24,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_PDG_convert_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_PDG_convert_cfg.py index cf4324895c73d..d4cc1e20589da 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_PDG_convert_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_PDG_convert_cfg.py @@ -17,8 +17,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Photos_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Photos_cfg.py index de9fb60f453b9..f53ee7e18358a 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Photos_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Photos_cfg.py @@ -23,8 +23,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(20)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_SLHA_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_SLHA_cfg.py index 7db80613f59b7..8adc47c6bbcac 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_SLHA_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_SLHA_cfg.py @@ -17,8 +17,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Ztautau_Tauola_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Ztautau_Tauola_cfg.py index a639942db65c5..0db7023abd583 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Ztautau_Tauola_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_Ztautau_Tauola_cfg.py @@ -16,8 +16,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_cfg.py index df00e85617e90..39dcdf28dbf27 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_cfg.py @@ -16,8 +16,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(20)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_gluino_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_gluino_cfg.py index 74c45cdce09b4..19476063c8469 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_gluino_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_gluino_cfg.py @@ -17,8 +17,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_stophadrons_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_stophadrons_cfg.py index 61c18d4e0c4d3..91d0755c2674a 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_stophadrons_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6GenFilter_stophadrons_cfg.py @@ -17,8 +17,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_RestoreRNDM_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_RestoreRNDM_cfg.py index 9f7a328748f30..fba914f955b2a 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_RestoreRNDM_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_RestoreRNDM_cfg.py @@ -22,8 +22,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_cfg.py index a711c6424b292..052f7480377f7 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_cfg.py @@ -21,8 +21,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(50)) diff --git a/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_mgmatching_cfg.py b/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_mgmatching_cfg.py index ca5a8752dab60..4641c9c4dd40d 100644 --- a/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_mgmatching_cfg.py +++ b/GeneratorInterface/Pythia6Interface/test/Py6HadFilter_mgmatching_cfg.py @@ -21,8 +21,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(1000)) diff --git a/GeneratorInterface/TauolaInterface/test/TauSpinnerWTest.py b/GeneratorInterface/TauolaInterface/test/TauSpinnerWTest.py index c1c818649c313..5eca3a504a372 100644 --- a/GeneratorInterface/TauolaInterface/test/TauSpinnerWTest.py +++ b/GeneratorInterface/TauolaInterface/test/TauSpinnerWTest.py @@ -24,8 +24,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(100)) diff --git a/GeneratorInterface/TauolaInterface/test/TauSpinnerZTest.py b/GeneratorInterface/TauolaInterface/test/TauSpinnerZTest.py index f73b330a985a8..c298d4ff934e9 100644 --- a/GeneratorInterface/TauolaInterface/test/TauSpinnerZTest.py +++ b/GeneratorInterface/TauolaInterface/test/TauSpinnerZTest.py @@ -24,8 +24,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(100)) diff --git a/Geometry/CSCGeometry/test/cgac_cfg.py b/Geometry/CSCGeometry/test/cgac_cfg.py index 22f574056fd23..3916464793802 100644 --- a/Geometry/CSCGeometry/test/cgac_cfg.py +++ b/Geometry/CSCGeometry/test/cgac_cfg.py @@ -31,8 +31,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgac_db_withb_cfg.py b/Geometry/CSCGeometry/test/cgac_db_withb_cfg.py index 3ad0a9885d48e..a8cc9d13ef415 100644 --- a/Geometry/CSCGeometry/test/cgac_db_withb_cfg.py +++ b/Geometry/CSCGeometry/test/cgac_db_withb_cfg.py @@ -42,8 +42,8 @@ # ============================== process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgacwithb_cfg.py b/Geometry/CSCGeometry/test/cgacwithb_cfg.py index ada899336febc..2c3266608e27a 100644 --- a/Geometry/CSCGeometry/test/cgacwithb_cfg.py +++ b/Geometry/CSCGeometry/test/cgacwithb_cfg.py @@ -36,8 +36,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgal_cfg.py b/Geometry/CSCGeometry/test/cgal_cfg.py index 8e56638a13daf..875b7b8548611 100644 --- a/Geometry/CSCGeometry/test/cgal_cfg.py +++ b/Geometry/CSCGeometry/test/cgal_cfg.py @@ -34,9 +34,9 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('*') -process.MessageLogger.categories.append('CSCLayerGeometry') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgos_cfg.py b/Geometry/CSCGeometry/test/cgos_cfg.py index 8dcc9ea30764e..a2b79ce5c13b9 100644 --- a/Geometry/CSCGeometry/test/cgos_cfg.py +++ b/Geometry/CSCGeometry/test/cgos_cfg.py @@ -31,8 +31,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgos_db_cfg.py b/Geometry/CSCGeometry/test/cgos_db_cfg.py index db15ef04ab772..a503c914d27e1 100644 --- a/Geometry/CSCGeometry/test/cgos_db_cfg.py +++ b/Geometry/CSCGeometry/test/cgos_db_cfg.py @@ -25,8 +25,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgow_cfg.py b/Geometry/CSCGeometry/test/cgow_cfg.py index ecd36f9c7e801..288379620a069 100644 --- a/Geometry/CSCGeometry/test/cgow_cfg.py +++ b/Geometry/CSCGeometry/test/cgow_cfg.py @@ -31,8 +31,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgow_db_cfg.py b/Geometry/CSCGeometry/test/cgow_db_cfg.py index ee0dcf0b8ec0d..c5e733c5e5551 100644 --- a/Geometry/CSCGeometry/test/cgow_db_cfg.py +++ b/Geometry/CSCGeometry/test/cgow_db_cfg.py @@ -25,8 +25,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/cgowung_db_cfg.py b/Geometry/CSCGeometry/test/cgowung_db_cfg.py index 0f0074c8a9011..1e72c11fb3a06 100644 --- a/Geometry/CSCGeometry/test/cgowung_db_cfg.py +++ b/Geometry/CSCGeometry/test/cgowung_db_cfg.py @@ -25,8 +25,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/clgi_cfg.py b/Geometry/CSCGeometry/test/clgi_cfg.py index 0c9394682a131..7e566d2568f84 100644 --- a/Geometry/CSCGeometry/test/clgi_cfg.py +++ b/Geometry/CSCGeometry/test/clgi_cfg.py @@ -54,8 +54,8 @@ # Note that this has no effect on errors from DDD - they come even if this is removed! process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/testCSCGeometryFromDB_cfg.py b/Geometry/CSCGeometry/test/testCSCGeometryFromDB_cfg.py index 2852144b68504..d28fe071b991d 100644 --- a/Geometry/CSCGeometry/test/testCSCGeometryFromDB_cfg.py +++ b/Geometry/CSCGeometry/test/testCSCGeometryFromDB_cfg.py @@ -20,8 +20,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometry/test/testCSCGeometry_cfg.py b/Geometry/CSCGeometry/test/testCSCGeometry_cfg.py index a0e35e2fb608d..7a399a33d32de 100644 --- a/Geometry/CSCGeometry/test/testCSCGeometry_cfg.py +++ b/Geometry/CSCGeometry/test/testCSCGeometry_cfg.py @@ -25,8 +25,8 @@ process.load('FWCore.MessageLogger.MessageLogger_cfi') process.MessageLogger.debugModules.append('CSCGeometryESModule') -process.MessageLogger.categories.append('CSCGeometry') -process.MessageLogger.categories.append('CSCGeometryBuilder') + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDD4hep_cfg.py b/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDD4hep_cfg.py index 6390df82a146b..5d6e2266e60a3 100644 --- a/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDD4hep_cfg.py +++ b/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDD4hep_cfg.py @@ -16,10 +16,10 @@ process.load("Geometry.CSCGeometryBuilder.cscGeometryDump_cfi") process.CSCGeometryESModule.applyAlignment = False -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('CSCNumberingScheme') - process.MessageLogger.categories.append('CSCGeometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDDD_cfg.py b/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDDD_cfg.py index a9cfd1a6903af..f6e9168326fd0 100644 --- a/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDDD_cfg.py +++ b/Geometry/CSCGeometryBuilder/test/python/dumpCSCGeometryDDD_cfg.py @@ -16,10 +16,10 @@ process.load("Geometry.CSCGeometryBuilder.cscGeometryDump_cfi") process.CSCGeometryESModule.applyAlignment = False -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('CSCNumberingScheme') - process.MessageLogger.categories.append('CSCGeometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/CaloTopology/test/testCaloTowerMap_cfg.py b/Geometry/CaloTopology/test/testCaloTowerMap_cfg.py index a5ce934f97965..efc0b9e66a0ab 100644 --- a/Geometry/CaloTopology/test/testCaloTowerMap_cfg.py +++ b/Geometry/CaloTopology/test/testCaloTowerMap_cfg.py @@ -7,8 +7,8 @@ process.load("RecoJets.Configuration.CaloTowersES_cfi") process.load("FWCore.MessageService.MessageLogger_cfi") -#if 'MessageLogger' in process.__dict__: -# process.MessageLogger.categories.append('HcalGeom') +# +# process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/CaloTopology/test/testHGCalTopology_cfg.py b/Geometry/CaloTopology/test/testHGCalTopology_cfg.py index 219a3bcf870a1..dee0ac9d07d9c 100644 --- a/Geometry/CaloTopology/test/testHGCalTopology_cfg.py +++ b/Geometry/CaloTopology/test/testHGCalTopology_cfg.py @@ -6,8 +6,8 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.load("Geometry.CaloTopology.hgcalTopologyTester_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/CaloTopology/test/testHcalDetId2DenseTester_cfg.py b/Geometry/CaloTopology/test/testHcalDetId2DenseTester_cfg.py index d6f66d221b046..00788101859c7 100644 --- a/Geometry/CaloTopology/test/testHcalDetId2DenseTester_cfg.py +++ b/Geometry/CaloTopology/test/testHcalDetId2DenseTester_cfg.py @@ -9,9 +9,9 @@ process.load('Configuration.Geometry.GeometryExtended2023D41Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalGeom') - process.MessageLogger.categories.append('CaloTopology') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py b/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py index 59b08fd01e584..a28f9ba2230af 100644 --- a/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py +++ b/Geometry/EcalCommonData/test/python/dumpECDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/EcalCommonData/data/dd4hep/cms-ecal-geometry-dump.xml'), diff --git a/Geometry/EcalCommonData/test/python/dumpECDDD_cfg.py b/Geometry/EcalCommonData/test/python/dumpECDDD_cfg.py index be1df858cafdf..2b0f38173f344 100644 --- a/Geometry/EcalCommonData/test/python/dumpECDDD_cfg.py +++ b/Geometry/EcalCommonData/test/python/dumpECDDD_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.EcalCommonData.EcalOnly_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('EcalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py b/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py index cf445b0341409..cacf8cb26c5b0 100644 --- a/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py +++ b/Geometry/EcalCommonData/test/python/runEcalSimParameterDD4Hep_cfg.py @@ -6,10 +6,10 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('Geometry') + + + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/EcalCommonData/data/dd4hep/cms-ecal-geometry.xml'), diff --git a/Geometry/EcalCommonData/test/python/runEcalSimParameterDDD_cfg.py b/Geometry/EcalCommonData/test/python/runEcalSimParameterDDD_cfg.py index 3f8b54e3516a9..dfb3468cb6f64 100644 --- a/Geometry/EcalCommonData/test/python/runEcalSimParameterDDD_cfg.py +++ b/Geometry/EcalCommonData/test/python/runEcalSimParameterDDD_cfg.py @@ -11,9 +11,9 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('EcalSim') + + + process.load('Geometry.EcalCommonData.ecalSimulationParametersAnalyzer_cff') diff --git a/Geometry/EcalTestBeam/test/runSurveyToTransforms_cfg.py b/Geometry/EcalTestBeam/test/runSurveyToTransforms_cfg.py index 0c34f74647256..e0c2ddc4b353f 100755 --- a/Geometry/EcalTestBeam/test/runSurveyToTransforms_cfg.py +++ b/Geometry/EcalTestBeam/test/runSurveyToTransforms_cfg.py @@ -5,7 +5,7 @@ process = cms.Process("SurveyToTransforms") #process.load("FWCore.MessageLogger.MessageLogger_cfi") -#process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +#process.MessageLogger.cout.enable = cms.untracked.bool(True) #process.MessageLogger.cout.threshold = cms.untracked.string('INFO') #process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/Geometry/ForwardCommonData/test/dumpHFNoseGeometry_cfg.py b/Geometry/ForwardCommonData/test/dumpHFNoseGeometry_cfg.py index d26224add1522..8a697361aa971 100644 --- a/Geometry/ForwardCommonData/test/dumpHFNoseGeometry_cfg.py +++ b/Geometry/ForwardCommonData/test/dumpHFNoseGeometry_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.ForwardCommonData.hfnoseAloneXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/ForwardCommonData/test/dumpT2Geometry_cfg.py b/Geometry/ForwardCommonData/test/dumpT2Geometry_cfg.py index 9e69ff405182d..7870ca96e17cf 100644 --- a/Geometry/ForwardCommonData/test/dumpT2Geometry_cfg.py +++ b/Geometry/ForwardCommonData/test/dumpT2Geometry_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.ForwardCommonData.totemT22021V2XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('ForwardGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/ForwardCommonData/test/g4OverlapCheck_cfg.py b/Geometry/ForwardCommonData/test/g4OverlapCheck_cfg.py index 45567791fe268..5a8e9738ef437 100644 --- a/Geometry/ForwardCommonData/test/g4OverlapCheck_cfg.py +++ b/Geometry/ForwardCommonData/test/g4OverlapCheck_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.ForwardCommonData.totemT22021XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('SimG4CoreApplication') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('ForwardGeom') + + + + from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import * process = checkOverlap(process) diff --git a/Geometry/ForwardCommonData/test/testHFNoseNumbering_cfg.py b/Geometry/ForwardCommonData/test/testHFNoseNumbering_cfg.py index 64a68818cd194..a26bb33d3110e 100644 --- a/Geometry/ForwardCommonData/test/testHFNoseNumbering_cfg.py +++ b/Geometry/ForwardCommonData/test/testHFNoseNumbering_cfg.py @@ -7,8 +7,8 @@ process.load("Geometry.ForwardCommonData.hfnoseNumberingInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/ForwardCommonData/test/testHFNoseParameters_cfg.py b/Geometry/ForwardCommonData/test/testHFNoseParameters_cfg.py index 064280c9b4e59..7b5b6b2f867d8 100644 --- a/Geometry/ForwardCommonData/test/testHFNoseParameters_cfg.py +++ b/Geometry/ForwardCommonData/test/testHFNoseParameters_cfg.py @@ -6,8 +6,8 @@ process.load("Geometry.ForwardCommonData.hfnoseParametersInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py b/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py index 84f8f8304992d..aabed8d918f21 100644 --- a/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py +++ b/Geometry/ForwardCommonData/test/testTotemT2Geometry_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ForwardGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/ForwardCommonData/data/dd4hep/cms-test-ddtotemt2-algorithm.xml'), diff --git a/Geometry/ForwardGeometry/test/testHFNoseGeometry_cfg.py b/Geometry/ForwardGeometry/test/testHFNoseGeometry_cfg.py index 3d37f43c49a12..f15d7f1d9d634 100644 --- a/Geometry/ForwardGeometry/test/testHFNoseGeometry_cfg.py +++ b/Geometry/ForwardGeometry/test/testHFNoseGeometry_cfg.py @@ -10,8 +10,8 @@ process.load("Geometry.ForwardGeometry.HFNoseGeometryESProducer_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py b/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py index 856cc3066f952..eb1ddf37f0054 100644 --- a/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py +++ b/Geometry/GEMGeometry/test/runGEMDetIdAnalysis_cfg.py @@ -5,8 +5,8 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('DataFormats.MuonDetId.gemDetIdAnalyzer_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('GEMAnalysis') + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Geometry/GEMGeometry/test/testGE0Geometry_cfg.py b/Geometry/GEMGeometry/test/testGE0Geometry_cfg.py index 289adf927dfac..82ef9e70896dd 100644 --- a/Geometry/GEMGeometry/test/testGE0Geometry_cfg.py +++ b/Geometry/GEMGeometry/test/testGE0Geometry_cfg.py @@ -13,19 +13,6 @@ ) process.source = cms.Source("EmptySource") -process.MessageLogger = cms.Service("MessageLogger", - destinations = cms.untracked.vstring('cout'), - categories = cms.untracked.vstring('GEMGeometryBuilderFromDDD'), - cout = cms.untracked.PSet( - default = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - GEMGeometryBuilderFromDDD = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) - ) - ) - process.test = cms.EDAnalyzer("GEMGeometryAnalyzer") process.p = cms.Path(process.test) @@ -38,11 +25,13 @@ ### before issuing the scram command above ############################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -# process.MessageLogger.categories.append("GEMGeometryBuilderFromDDD") -# process.MessageLogger.categories.append("GEMNumberingScheme") +# +# process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = cms.untracked.PSet() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/Geometry/GEMGeometry/test/testGEMGeometry_cfg.py b/Geometry/GEMGeometry/test/testGEMGeometry_cfg.py index da8e2d3fe1bb2..2c78ed6ff2151 100644 --- a/Geometry/GEMGeometry/test/testGEMGeometry_cfg.py +++ b/Geometry/GEMGeometry/test/testGEMGeometry_cfg.py @@ -13,19 +13,6 @@ ) process.source = cms.Source("EmptySource") -process.MessageLogger = cms.Service("MessageLogger", - destinations = cms.untracked.vstring('cout'), - categories = cms.untracked.vstring('GEMGeometryBuilderFromDDD'), - cout = cms.untracked.PSet( - default = cms.untracked.PSet( - limit = cms.untracked.int32(0) - ), - GEMGeometryBuilderFromDDD = cms.untracked.PSet( - limit = cms.untracked.int32(-1) - ) - ) - ) - process.test = cms.EDAnalyzer("GEMGeometryAnalyzer") process.p = cms.Path(process.test) @@ -38,11 +25,13 @@ ### before issuing the scram command above ############################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -# process.MessageLogger.categories.append("GEMGeometryBuilderFromDDD") -# process.MessageLogger.categories.append("GEMNumberingScheme") +# +# process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/Geometry/GEMGeometry/test/testME0Geometry_cfg.py b/Geometry/GEMGeometry/test/testME0Geometry_cfg.py index 81a2621d86ea1..bd0092411a409 100644 --- a/Geometry/GEMGeometry/test/testME0Geometry_cfg.py +++ b/Geometry/GEMGeometry/test/testME0Geometry_cfg.py @@ -13,12 +13,14 @@ ### before issuing the scram command above ############################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -# process.MessageLogger.categories.append("ME0GeometryESModule") -# process.MessageLogger.categories.append("ME0GeometryBuilder") -# process.MessageLogger.categories.append("ME0NumberingScheme") +# +# +# process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py index 1f6455fbd1dff..4f88e18343d21 100644 --- a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDD4Hep_cfg.py @@ -16,10 +16,10 @@ appendToDataLabel = cms.string('') ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('GEMNumberingScheme') - process.MessageLogger.categories.append('GEMGeometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDDD_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDDD_cfg.py index 9a0d4f7d56973..b1c277407cff6 100644 --- a/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDDD_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/dumpGEMGeometryDDD_cfg.py @@ -9,10 +9,10 @@ process.load("Geometry.GEMGeometryBuilder.gemGeometry_cff") process.load("Geometry.GEMGeometryBuilder.gemGeometryDump_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('GEMNumberingScheme') - process.MessageLogger.categories.append('GEMGeometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py index 13b2f3e093ca2..147fad8060cdd 100644 --- a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDD4Hep_cfg.py @@ -17,10 +17,10 @@ appendToDataLabel = cms.string('') ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('ME0NumberingScheme') - process.MessageLogger.categories.append('ME0Geometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDDD_cfg.py b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDDD_cfg.py index 9864d96c4a713..55da4cce3fbee 100644 --- a/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDDD_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/dumpME0GeometryDDD_cfg.py @@ -9,10 +9,10 @@ process.load("Geometry.GEMGeometryBuilder.me0Geometry_cff") process.load("Geometry.GEMGeometryBuilder.me0GeometryDump_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('ME0NumberingScheme') - process.MessageLogger.categories.append('ME0Geometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py index b23f5c2844a64..beafd51360849 100644 --- a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDD4Hep_cfg.py @@ -13,9 +13,9 @@ process.load("Geometry.MuonNumbering.muonGeometryConstants_cff") process.load("Geometry.GEMGeometryBuilder.gemGeometry_cff") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('GEMNumberingScheme') + + + process.test = cms.EDAnalyzer("DDTestMuonNumbering") diff --git a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDDD_cfg.py b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDDD_cfg.py index cb43f7535fb8f..502b7ad05e2b5 100644 --- a/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDDD_cfg.py +++ b/Geometry/GEMGeometryBuilder/test/python/validateGEMGeometryDDD_cfg.py @@ -14,9 +14,9 @@ process.load("Geometry.MuonNumbering.muonGeometryConstants_cff") process.load("Geometry.GEMGeometryBuilder.gemGeometry_cff") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('GEMNumberingScheme') + + + # # Note: Please, download the geometry file from a location diff --git a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py index 0e8bda3317e58..38b8ca5d96287 100644 --- a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddahcalModuleAlgo-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDDD_cfg.py index 8baa5e476fe9e..08d90f2126fda 100644 --- a/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpAHcalModuleDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testAHcalModuleAlgoXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py index cf141e984931d..873efcc277ecd 100644 --- a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2026D46.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDDD_cfg.py index 3aad9bd70f892..353fdacd40ba0 100644 --- a/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpExtendedHGCalGeometryDDD_cfg.py @@ -7,10 +7,10 @@ process.load("Configuration.Geometry.GeometryExtended2026D49_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py index 7edfc6f2314c0..b5da7cbed772a 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalcell-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDDD_cfg.py index f2633d6ea94cb..ede9efc1f4638 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalCellDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalCellDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalCellXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py index cb5a07628593b..d3b72db2e86a0 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalEE-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDDD_cfg.py index 698c10f8e826e..8713a80efb487 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalEEDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalEEDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalEEXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py index 4f4a818a9f5f9..95bd5b37ae814 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/testHGCalV10.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py index 25d9e10a47382..909193eed60bd 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalGeometryDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalV13XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py index 262a721c237c0..3a5af855ced95 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEmix-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDDD_cfg.py index f987853217f4a..d639eb3972b84 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEmixDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalHEmixXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py index c4922b2ebc639..4a95db1a17b20 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalHEsil-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDDD_cfg.py index 5bb7734211cd5..25c85afd81b72 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalHEsilDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalHEsilXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py index 5f75d0de356a7..1a4e390793176 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModuleAlgo-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py index c7d1e436a7c1c..b6311878697ce 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleAlgoDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalModuleAlgoXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py index fe45950146f9c..d3843b3f9165a 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalModule-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py index a6e878e191576..8c9244e159d96 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalModuleDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalModuleXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py index 4dff0f4debb44..9116ece19a9ef 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalNoTaperEndcap-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDDD_cfg.py index e481127763320..e9a8dbba4763c 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalNoTaperEndcapDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalNoTaperEndcapXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBGeometryDDD_cfg.py index 6bda868bd1fcf..51a6a9275937f 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBGeometryDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBGeometryDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testTB181V0XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py index 59457363495e4..93e72b2feb89a 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTBModule-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDDD_cfg.py index 13e7723ff2690..c6282747c6800 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalTBModuleXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py index 18ba8757fecfd..737bce683f248 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTBModuleX-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDDD_cfg.py index e355d73065bec..639e5c8a6cc00 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalTBModuleXDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalTBModuleXXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py index d65db089f68f3..f6ce3a4304ec7 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwafer8-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DDD_cfg.py index 58567474add9e..8153feee8969b 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWafer8DDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalWafer8XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py index 10eb9a3d8241c..cd48f119b5961 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalWaferAlgo-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDDD_cfg.py index c2d04bcfc9b38..6611ba1b0d306 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferAlgoDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalWaferAlgoXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py index 79a3a577a8438..977e60d22da92 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDD4Hep_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalwafer-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDDD_cfg.py index 5ea889b0b9fc5..278c19b086507 100644 --- a/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpHGCalWaferDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testHGCalWaferXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/dumpTBGeometryDDD_cfg.py b/Geometry/HGCalCommonData/test/python/dumpTBGeometryDDD_cfg.py index 998122a85ad6a..b8d98b0563377 100644 --- a/Geometry/HGCalCommonData/test/python/dumpTBGeometryDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/dumpTBGeometryDDD_cfg.py @@ -4,10 +4,10 @@ process.load("Geometry.HGCalCommonData.testTB181XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/hgcalV11_cfg.py b/Geometry/HGCalCommonData/test/python/hgcalV11_cfg.py index 0b9d9eccbb55e..98d9f0154bd5a 100644 --- a/Geometry/HGCalCommonData/test/python/hgcalV11_cfg.py +++ b/Geometry/HGCalCommonData/test/python/hgcalV11_cfg.py @@ -22,9 +22,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HGCSim') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalCommonData/test/python/runTest_cfg.py b/Geometry/HGCalCommonData/test/python/runTest_cfg.py index 7e9e30d02bdec..507dd1c62024f 100644 --- a/Geometry/HGCalCommonData/test/python/runTest_cfg.py +++ b/Geometry/HGCalCommonData/test/python/runTest_cfg.py @@ -25,10 +25,10 @@ input = cms.untracked.int32(1) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('SimG4CoreGeometry') - process.MessageLogger.categories.append('HGCSim') + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py index b86828e78f5f6..79e8d990d484a 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCGeometry_cfg.py @@ -16,8 +16,8 @@ process.load("Geometry.HGCalCommonData.hgcalNumberingInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py index 32a12e56dbc21..65e8ee5a267b5 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalNumbering_cfg.py @@ -12,8 +12,8 @@ process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py index c2feb0847dd66..302dbdfb5c06a 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalParametersDD4Hep_cfg.py @@ -5,8 +5,8 @@ process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/testHGCalV14.xml'), diff --git a/Geometry/HGCalCommonData/test/python/testHGCalParametersDDD_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalParametersDDD_cfg.py index 8265cecd9a220..928dd5b64c2e7 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalParametersDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalParametersDDD_cfg.py @@ -8,8 +8,8 @@ process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py index bf634bc6dbae6..c7bd08b0b698a 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDD4Hep_cfg.py @@ -5,8 +5,8 @@ process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HGCalCommonData/data/dd4hep/cms-test-ddhgcalTB181V1-algorithm.xml'), diff --git a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDDD_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDDD_cfg.py index 6be5913c36224..7986eb8764e4a 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDDD_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalTBParametersDDD_cfg.py @@ -6,8 +6,8 @@ process.load("Geometry.HGCalCommonData.hgcalParametersInitialization_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py index 6d30731f086d2..97112276f9474 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalValidHex_cfg.py @@ -12,8 +12,8 @@ process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py b/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py index 7e0820c9800a7..a2c3147941857 100644 --- a/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py +++ b/Geometry/HGCalCommonData/test/python/testHGCalWafer_cfg.py @@ -12,8 +12,8 @@ process.load("Geometry.HcalCommonData.hcalDDDSimConstants_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py index a3ed3494a1904..b2172d8e4340a 100644 --- a/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py +++ b/Geometry/HGCalGeometry/test/python/runCaloCellGeometryTest_cfg.py @@ -8,9 +8,9 @@ process.load("Configuration.Geometry.GeometryExtended2026D71Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('CaloGeometryBuilder') + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py index 3f9d95bd6cef0..e613940c092e3 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalCorner_cfg.py @@ -9,8 +9,8 @@ process.load("Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py index abd7df5f6485b..dc79c359affb1 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeomLocator_cfg.py @@ -7,8 +7,8 @@ #process.load("Configuration.Geometry.GeometryExtended2026D49Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py index 517c20a699404..676e785666dfb 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryCheck_cfg.py @@ -14,8 +14,8 @@ process.load('Geometry.HGCalGeometry.hgcalGeometryCheck_cfi') process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py index aa1ce8766410e..d8750a44a4d20 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometryMouseBite_cfg.py @@ -6,8 +6,8 @@ process.load("Configuration.Geometry.GeometryExtended2026D60Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py index 89e7f514949ad..f5931c2a8963c 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalGeometry_cfg.py @@ -11,8 +11,8 @@ #process.load("Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py index 75d83e0257ea7..d9662a29bdc25 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalNeighbor_cfg.py @@ -13,8 +13,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py index 0f1f13eb1f886..508af521978a0 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalRecHitTool_cfg.py @@ -8,8 +8,8 @@ #process.load("Configuration.Geometry.GeometryExtended2026D71Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalSize_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalSize_cfg.py index 8e494b2b49700..100bbd9565443 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalSize_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalSize_cfg.py @@ -10,8 +10,8 @@ process.load("Geometry.HGCalGeometry.HGCalGeometryESProducer_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferCell_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferCell_cfg.py index ef7d2ff2f27ff..c7f84c655e3ea 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferCell_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferCell_cfg.py @@ -10,8 +10,8 @@ process.load("Geometry.HGCalGeometry.hgcalEEWaferCell_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py index 9021ddd7173c9..16dbc7a8fc009 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileCheck_cfg.py @@ -10,8 +10,8 @@ process.load("Geometry.HGCalGeometry.hgcalEEWaferInFileCheck_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileTest_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileTest_cfg.py index 26b00130c4cf5..71fada611416d 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileTest_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferInFileTest_cfg.py @@ -10,8 +10,8 @@ process.load("Geometry.HGCalGeometry.hgcalEEWaferInFileTest_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py index 894dd58bd6077..b8a3a4aa0d03b 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWaferTypeTester_cfg.py @@ -6,8 +6,8 @@ process.load("Geometry.HGCalGeometry.hgcalEEWaferTypeTester_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py b/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py index 604351681143c..dc3bd05630c7a 100644 --- a/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py +++ b/Geometry/HGCalGeometry/test/python/testHGCalWafer_cfg.py @@ -5,8 +5,8 @@ process.load("Configuration.Geometry.GeometryExtended2026D71Reco_cff") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HcalAlgo/test/python/dumpForwardShield_cfg.py b/Geometry/HcalAlgo/test/python/dumpForwardShield_cfg.py index 4dc2c338b028a..3c9a407f60a6e 100644 --- a/Geometry/HcalAlgo/test/python/dumpForwardShield_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpForwardShield_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomForwardShield_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpHBGeom_cfg.py b/Geometry/HcalAlgo/test/python/dumpHBGeom_cfg.py index 27219c4b802c0..215d3ffc55e7a 100644 --- a/Geometry/HcalAlgo/test/python/dumpHBGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpHBGeom_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomHB_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpHEPhase0Geom_cfg.py b/Geometry/HcalAlgo/test/python/dumpHEPhase0Geom_cfg.py index a0907dfdd90ee..11b6bddc017dc 100644 --- a/Geometry/HcalAlgo/test/python/dumpHEPhase0Geom_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpHEPhase0Geom_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomHEPhase0_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpHEPhase1Geom_cfg.py b/Geometry/HcalAlgo/test/python/dumpHEPhase1Geom_cfg.py index 60f0b1b030cdb..7cb9e2c76c564 100644 --- a/Geometry/HcalAlgo/test/python/dumpHEPhase1Geom_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpHEPhase1Geom_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomHEPhase1_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpHFGeom_cfg.py b/Geometry/HcalAlgo/test/python/dumpHFGeom_cfg.py index 98a441900f19e..1495e1df71e57 100644 --- a/Geometry/HcalAlgo/test/python/dumpHFGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpHFGeom_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomHF_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/dumpHOGeom_cfg.py index 82471ad5a8954..eaa74f1e2739f 100644 --- a/Geometry/HcalAlgo/test/python/dumpHOGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpHOGeom_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomHO_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpHcalXtal_cfg.py b/Geometry/HcalAlgo/test/python/dumpHcalXtal_cfg.py index 97a9eb28cc689..2aa133cc9da2b 100644 --- a/Geometry/HcalAlgo/test/python/dumpHcalXtal_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpHcalXtal_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomHcalXtal_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpTBCable_cfg.py b/Geometry/HcalAlgo/test/python/dumpTBCable_cfg.py index ed5e5db35dd3e..08a66366512e4 100644 --- a/Geometry/HcalAlgo/test/python/dumpTBCable_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpTBCable_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomTBCable_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpTBHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/dumpTBHOGeom_cfg.py index c39c55660571f..b4b5025ce8fba 100644 --- a/Geometry/HcalAlgo/test/python/dumpTBHOGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpTBHOGeom_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomTBHO_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/dumpTestBeam_cfg.py b/Geometry/HcalAlgo/test/python/dumpTestBeam_cfg.py index 400cf1b3bdcb8..24a35dae71dcc 100644 --- a/Geometry/HcalAlgo/test/python/dumpTestBeam_cfg.py +++ b/Geometry/HcalAlgo/test/python/dumpTestBeam_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.HcalAlgo.testGeomBeamLine_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py b/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py index 9a1361c5551c4..368da3ba871af 100644 --- a/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py +++ b/Geometry/HcalAlgo/test/python/testForwardShield_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalForwardShield-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py index 86aee05bbf1fe..169167c800744 100644 --- a/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHBGeom_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHB-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py b/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py index 0dd6f6b64b57e..600a92d01cd3a 100644 --- a/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHEPhase0Geom_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHEPhase0-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py b/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py index 5f4cf1297aaf3..d9e88a6e7ad90 100644 --- a/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHEPhase1Geom_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHEPhase1-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py index 9b60434c0fd10..8076811f40d1f 100644 --- a/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHFGeom_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHF-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py index 046efe736ff89..919763e5c8fb6 100644 --- a/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHOGeom_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHO-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py b/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py index ca38d607eab8b..115477cb25fc9 100644 --- a/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py +++ b/Geometry/HcalAlgo/test/python/testHcalXtal_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalXtal-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testTBCable_cfg.py b/Geometry/HcalAlgo/test/python/testTBCable_cfg.py index e9ce79ddd6d20..7d3825adf2453 100644 --- a/Geometry/HcalAlgo/test/python/testTBCable_cfg.py +++ b/Geometry/HcalAlgo/test/python/testTBCable_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalTBCable-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py b/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py index db1d5fdb0938a..a0a674801f8dd 100644 --- a/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py +++ b/Geometry/HcalAlgo/test/python/testTBHOGeom_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalTBZpos-algorithm.xml'), diff --git a/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py b/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py index 4ef6318f4fd82..0b42529fa8a9c 100644 --- a/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py +++ b/Geometry/HcalAlgo/test/python/testTestBeam_cfg.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalTestBeam-algorithm.xml'), diff --git a/Geometry/HcalCommonData/test/python/runCaloPararemetrsAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runCaloPararemetrsAnalyzer_cfg.py index 79220b8cb459f..8bec1af45ebfa 100644 --- a/Geometry/HcalCommonData/test/python/runCaloPararemetrsAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runCaloPararemetrsAnalyzer_cfg.py @@ -12,8 +12,8 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.hpa = cms.EDAnalyzer("CaloSimParametersAnalyzer") diff --git a/Geometry/HcalCommonData/test/python/runCaloPararemetrsTester_cfg.py b/Geometry/HcalCommonData/test/python/runCaloPararemetrsTester_cfg.py index 7e90fb98be9fd..6fd28e142103b 100644 --- a/Geometry/HcalCommonData/test/python/runCaloPararemetrsTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runCaloPararemetrsTester_cfg.py @@ -7,9 +7,9 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('Geometry') + + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalHF-algorithm.xml'), diff --git a/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4HepAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4HepAnalyzer_cfg.py index daaa578426dc0..94fbc67a51761 100644 --- a/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4HepAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalParametersFromDD4HepAnalyzer_cfg.py @@ -5,9 +5,9 @@ process.load('Geometry.HcalCommonData.hcalSimulationParameters_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('Geometry') + + + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py index 937e737eb957a..de67d36cfb0cd 100644 --- a/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalParametersFromDDDAnalyzer_cfg.py @@ -11,8 +11,8 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.hpa = cms.EDAnalyzer("HcalParametersAnalyzer") diff --git a/Geometry/HcalCommonData/test/python/runHcalRecNumberingDD4hepTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalRecNumberingDD4hepTester_cfg.py index ef3e8aeefd621..7098bed17fa1b 100644 --- a/Geometry/HcalCommonData/test/python/runHcalRecNumberingDD4hepTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalRecNumberingDD4hepTester_cfg.py @@ -6,8 +6,8 @@ process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalGeom') + + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py index 523a01cde95a8..5a833b6e2c6ef 100644 --- a/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalRecNumberingDDDTester_cfg.py @@ -7,8 +7,8 @@ #process.load('Configuration.Geometry.GeometryExtended2026D41Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalGeom') + + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/HcalCommonData/test/python/runHcalScintillatorTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalScintillatorTester_cfg.py index 25b157db6b323..79b5274ed9928 100644 --- a/Geometry/HcalCommonData/test/python/runHcalScintillatorTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalScintillatorTester_cfg.py @@ -9,8 +9,8 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.hpa = cms.EDAnalyzer("HcalScintillatorTester") diff --git a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDD4hepTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDD4hepTester_cfg.py index be44e24b4bbb3..87fb935a74833 100644 --- a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDD4hepTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDD4hepTester_cfg.py @@ -6,8 +6,8 @@ process.load('Configuration.Geometry.GeometryDD4hepExtended2021_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalGeom') + + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py index 175507d3653a3..3dd9b51de7f62 100644 --- a/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalSimNumberingDDDTester_cfg.py @@ -9,8 +9,8 @@ process.load('Configuration.Geometry.GeometryExtended2021_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HcalGeom') + + process.source = cms.Source("EmptySource") process.maxEvents = cms.untracked.PSet( diff --git a/Geometry/HcalCommonData/test/python/runHcalSimParametersAnalyzer_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimParametersAnalyzer_cfg.py index a41491b09e1f4..2bfad9e474fcf 100644 --- a/Geometry/HcalCommonData/test/python/runHcalSimParametersAnalyzer_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalSimParametersAnalyzer_cfg.py @@ -12,8 +12,8 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + process.hpa = cms.EDAnalyzer("HcalSimParametersAnalyzer") diff --git a/Geometry/HcalCommonData/test/python/runHcalSimParametersTester_cfg.py b/Geometry/HcalCommonData/test/python/runHcalSimParametersTester_cfg.py index 6ece1f92e939d..78f0b0dc2a421 100644 --- a/Geometry/HcalCommonData/test/python/runHcalSimParametersTester_cfg.py +++ b/Geometry/HcalCommonData/test/python/runHcalSimParametersTester_cfg.py @@ -7,9 +7,9 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('Geometry') + + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/HcalAlgo/data/cms-test-ddhcalPhase2-algorithm.xml'), diff --git a/Geometry/HcalTestBeamData/test/python/run2004_cfg.py b/Geometry/HcalTestBeamData/test/python/run2004_cfg.py index 9c41ddea372fa..40e33c57ee395 100644 --- a/Geometry/HcalTestBeamData/test/python/run2004_cfg.py +++ b/Geometry/HcalTestBeamData/test/python/run2004_cfg.py @@ -27,15 +27,15 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTBSim') - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('CaloSim') - process.MessageLogger.categories.append('SimHCalData') - process.MessageLogger.categories.append('VertexGenerator') + + + + + + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py b/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py index a27b03735753f..c33663947b6eb 100644 --- a/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py +++ b/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDD4Hep_cfg.py @@ -24,13 +24,13 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTBSim') - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('CaloSim') + + + + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDDD_cfg.py b/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDDD_cfg.py index b8951a3f27c16..5b91b76589c81 100644 --- a/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDDD_cfg.py +++ b/Geometry/HcalTestBeamData/test/python/testHcalTBParameterDDD_cfg.py @@ -16,13 +16,13 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTBSim') - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('CaloSim') + + + + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/MuonCommonData/test/python/dumpGE0_cfg.py b/Geometry/MuonCommonData/test/python/dumpGE0_cfg.py index 35be20676425a..ad3d00a501f1f 100644 --- a/Geometry/MuonCommonData/test/python/dumpGE0_cfg.py +++ b/Geometry/MuonCommonData/test/python/dumpGE0_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.MuonCommonData.testGE0XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('MuonGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/MuonCommonData/test/python/dumpGEM_cfg.py b/Geometry/MuonCommonData/test/python/dumpGEM_cfg.py index 52b4918491501..3d688f96aee21 100644 --- a/Geometry/MuonCommonData/test/python/dumpGEM_cfg.py +++ b/Geometry/MuonCommonData/test/python/dumpGEM_cfg.py @@ -5,10 +5,10 @@ process.load("Geometry.MuonCommonData.testGEMXML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('MuonGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/MuonCommonData/test/python/runME_cfg.py b/Geometry/MuonCommonData/test/python/runME_cfg.py index d142ac3c71110..c9bffb706a909 100644 --- a/Geometry/MuonCommonData/test/python/runME_cfg.py +++ b/Geometry/MuonCommonData/test/python/runME_cfg.py @@ -22,10 +22,10 @@ process.GlobalTag.globaltag = autoCond['run1_mc'] process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('MuonGeom') + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Geometry/MuonCommonData/test/python/testDDGEMAngularAlgorithm.py b/Geometry/MuonCommonData/test/python/testDDGEMAngularAlgorithm.py index fc18c77ddef98..5fcd76ec4f756 100644 --- a/Geometry/MuonCommonData/test/python/testDDGEMAngularAlgorithm.py +++ b/Geometry/MuonCommonData/test/python/testDDGEMAngularAlgorithm.py @@ -9,8 +9,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MuonGeom') + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/MuonCommonData/data/cms-test-ddgemangular-algorithm.xml'), diff --git a/Geometry/MuonNumbering/test/testMuonOffsetDD4Hep_cfg.py b/Geometry/MuonNumbering/test/testMuonOffsetDD4Hep_cfg.py index c89c802dc4c26..2c0938067142a 100644 --- a/Geometry/MuonNumbering/test/testMuonOffsetDD4Hep_cfg.py +++ b/Geometry/MuonNumbering/test/testMuonOffsetDD4Hep_cfg.py @@ -13,8 +13,8 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MuonGeom') + + process.hpa = cms.EDAnalyzer("MuonOffsetAnalyzer") process.Timing = cms.Service("Timing") diff --git a/Geometry/MuonNumbering/test/testMuonOffsetDDD_cfg.py b/Geometry/MuonNumbering/test/testMuonOffsetDDD_cfg.py index 160d3cec9612f..817eab3ecf235 100644 --- a/Geometry/MuonNumbering/test/testMuonOffsetDDD_cfg.py +++ b/Geometry/MuonNumbering/test/testMuonOffsetDDD_cfg.py @@ -13,8 +13,8 @@ input = cms.untracked.int32(1) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MuonGeom') + + process.hpa = cms.EDAnalyzer("MuonOffsetAnalyzer") process.Timing = cms.Service("Timing") diff --git a/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDD4hep_cfg.py b/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDD4hep_cfg.py index 9974017813213..cbfaf1ab49989 100644 --- a/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDD4hep_cfg.py +++ b/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDD4hep_cfg.py @@ -9,10 +9,10 @@ process.load("Geometry.RPCGeometryBuilder.rpcGeometry_cfi") process.load("Geometry.RPCGeometryBuilder.rpcGeometryDump_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('RPCNumberingScheme') - process.MessageLogger.categories.append('RPCGeometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDDD_cfg.py b/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDDD_cfg.py index d65a622045453..e4c18dc9096fa 100644 --- a/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDDD_cfg.py +++ b/Geometry/RPCGeometryBuilder/test/python/dumpRPCGeometryDDD_cfg.py @@ -9,10 +9,10 @@ process.load("Geometry.RPCGeometryBuilder.rpcGeometry_cfi") process.load("Geometry.RPCGeometryBuilder.rpcGeometryDump_cfi") -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('Geometry') - process.MessageLogger.categories.append('RPCNumberingScheme') - process.MessageLogger.categories.append('RPCGeometry') + + + + process.source = cms.Source('EmptySource') diff --git a/Geometry/TrackerCommonData/test/python/dumpTracker_cfg.py b/Geometry/TrackerCommonData/test/python/dumpTracker_cfg.py index 46f1657ed1c93..50a72a638ba5a 100644 --- a/Geometry/TrackerCommonData/test/python/dumpTracker_cfg.py +++ b/Geometry/TrackerCommonData/test/python/dumpTracker_cfg.py @@ -5,12 +5,12 @@ process.load("Geometry.TrackerCommonData.cmsExtendedGeometry2017XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('PixelGeom') - process.MessageLogger.categories.append('TIBGeom') - process.MessageLogger.categories.append('TIDGeom') - process.MessageLogger.categories.append('TOBGeom') - process.MessageLogger.categories.append('TECGeom') + + + + + + process.source = cms.Source("EmptySource") diff --git a/Geometry/TrackerCommonData/test/python/run21Zero.py b/Geometry/TrackerCommonData/test/python/run21Zero.py index 08ef335dedd45..889e66d2e57c4 100644 --- a/Geometry/TrackerCommonData/test/python/run21Zero.py +++ b/Geometry/TrackerCommonData/test/python/run21Zero.py @@ -28,8 +28,8 @@ output = cms.optional.untracked.allowed(cms.int32,cms.PSet) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('SimG4CoreGeometry') + + # Input source process.source = cms.Source("EmptySource") diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py index 320c6fa075d70..e076bc7b2fdac 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerModuleInfoDDD_cfg.py @@ -28,9 +28,9 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.debugModules.append('*') -process.MessageLogger.categories.append('TrackerGeometryBuilder') -process.MessageLogger.categories.append('TrackerNumberingBuilder') -process.MessageLogger.categories.append('ModuleInfo') + + + process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/Geometry/TrackerGeometryBuilder/test/python/testTrackerParametersFromDD4hep_cfg.py b/Geometry/TrackerGeometryBuilder/test/python/testTrackerParametersFromDD4hep_cfg.py index 7dfcf98b79102..fded6b4c2e157 100644 --- a/Geometry/TrackerGeometryBuilder/test/python/testTrackerParametersFromDD4hep_cfg.py +++ b/Geometry/TrackerGeometryBuilder/test/python/testTrackerParametersFromDD4hep_cfg.py @@ -4,8 +4,8 @@ process = cms.Process("TrackerParametersTest", Run3_dd4hep) process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TrackerParametersAnalyzer') + + process.MessageLogger.destinations.append('cout') process.MessageLogger = cms.Service("MessageLogger", diff --git a/Geometry/TrackerNumberingBuilder/test/trackerModuleNumberingDD4hep_cfg.py b/Geometry/TrackerNumberingBuilder/test/trackerModuleNumberingDD4hep_cfg.py index b6a45a2c17997..a687ec4abb74b 100644 --- a/Geometry/TrackerNumberingBuilder/test/trackerModuleNumberingDD4hep_cfg.py +++ b/Geometry/TrackerNumberingBuilder/test/trackerModuleNumberingDD4hep_cfg.py @@ -7,8 +7,8 @@ process.load('Configuration.Geometry.GeometryDD4hepExtended2021Reco_cff') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TrackerGeometryBuilder') + + process.source = cms.Source("EmptySource") diff --git a/HLTrigger/Configuration/python/CustomConfigs.py b/HLTrigger/Configuration/python/CustomConfigs.py index b5316af4cc934..e303c5a21d418 100644 --- a/HLTrigger/Configuration/python/CustomConfigs.py +++ b/HLTrigger/Configuration/python/CustomConfigs.py @@ -22,10 +22,10 @@ def Base(process): process.options.numberOfStreams = cms.untracked.uint32( 0 ) process.options.sizeOfStackForThreadsInKB = cms.untracked.uint32( 10*1024 ) - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') + + + + # No longer override - instead use GT config as provided via cmsDriver ## override the GlobalTag, connection string and pfnPrefix diff --git a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py index 3323c797181ab..e5e9c8793d913 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_FULL.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_FULL.py @@ -131229,12 +131229,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run3_hlt_FULL') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py index d6522b705e355..5492da7d665a2 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake.py @@ -373,12 +373,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run1_hlt_Fake') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py index d859b9bee82d4..a4c2435e625e2 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake1.py @@ -390,12 +390,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run2_hlt_Fake1') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py index 8fc501268857a..673b508d776d3 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_Fake2.py @@ -398,12 +398,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run2_hlt_Fake2') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py index b4f18b1d21fe9..b3aa28afd3341 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_GRun.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_GRun.py @@ -92124,12 +92124,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run3_hlt_GRun') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py index d6550f506e6fd..ef6d6baebfb04 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_HIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_HIon.py @@ -34415,12 +34415,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run3_hlt_HIon') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # load the DQMStore and DQMRootOutputModule process.load( "DQMServices.Core.DQMStore_cfi" ) diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py index 08c4d2193e2d4..4836dd184ffb3 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PIon.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PIon.py @@ -5872,12 +5872,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run3_hlt_PIon') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py index defe110100ccb..dd9286ccd3a5f 100644 --- a/HLTrigger/Configuration/test/OnLine_HLT_PRef.py +++ b/HLTrigger/Configuration/test/OnLine_HLT_PRef.py @@ -11874,12 +11874,12 @@ from Configuration.AlCa.GlobalTag import GlobalTag as customiseGlobalTag process.GlobalTag = customiseGlobalTag(process.GlobalTag, globaltag = 'auto:run3_hlt_PRef') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('TriggerSummaryProducerAOD') - process.MessageLogger.categories.append('L1GtTrigReport') - process.MessageLogger.categories.append('L1TGlobalSummary') - process.MessageLogger.categories.append('HLTrigReport') - process.MessageLogger.categories.append('FastReport') + + + + + + # add specific customizations _customInfo = {} diff --git a/HLTrigger/Configuration/test/analyse_cfg.py b/HLTrigger/Configuration/test/analyse_cfg.py index d0458e394dac8..58be86ef72354 100644 --- a/HLTrigger/Configuration/test/analyse_cfg.py +++ b/HLTrigger/Configuration/test/analyse_cfg.py @@ -3,17 +3,17 @@ process = cms.Process("ANA") process.load('FWCore/MessageService/MessageLogger_cfi') -process.MessageLogger.categories.append('TriggerSummaryAnalyzerAOD') -process.MessageLogger.categories.append('TriggerSummaryAnalyzerRAW') -process.MessageLogger.categories.append('HLTEventAnalyzerAOD') -process.MessageLogger.categories.append('HLTEventAnalyzerRAW') -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.categories.append('L1TGlobalSummary') -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('HLTSummaryFilter') -process.MessageLogger.categories.append('HLTConfigProvider') -process.MessageLogger.categories.append('HLTPrescaleProvider') -process.MessageLogger.categories.append('HLTConfigData') + + + + + + + + + + + # process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') # process.load('Configuration.StandardSequences.CondDBESSource_cff') diff --git a/HLTrigger/HLTanalyzers/test/HLTrigReport.py b/HLTrigger/HLTanalyzers/test/HLTrigReport.py index fa27ec3f217d9..2fd91e22cd410 100644 --- a/HLTrigger/HLTanalyzers/test/HLTrigReport.py +++ b/HLTrigger/HLTanalyzers/test/HLTrigReport.py @@ -4,7 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 999999999 -process.MessageLogger.categories.append('HLTrigReport') + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(False) diff --git a/HLTrigger/HLTanalyzers/test/test_hltrigreport_base_cfg.py b/HLTrigger/HLTanalyzers/test/test_hltrigreport_base_cfg.py index e473b586274d3..feaf339824ea3 100644 --- a/HLTrigger/HLTanalyzers/test/test_hltrigreport_base_cfg.py +++ b/HLTrigger/HLTanalyzers/test/test_hltrigreport_base_cfg.py @@ -4,7 +4,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 999999999 -process.MessageLogger.categories.append('HLTrigReport') + process.options.wantSummary = False diff --git a/HLTrigger/HLTcore/test/getHLTPrescaleTable.py b/HLTrigger/HLTcore/test/getHLTPrescaleTable.py index 3fc4cc449fe64..c6db2cf343982 100644 --- a/HLTrigger/HLTcore/test/getHLTPrescaleTable.py +++ b/HLTrigger/HLTcore/test/getHLTPrescaleTable.py @@ -3,7 +3,7 @@ process = cms.Process("PUT") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('HLTPrescaleRecorder') + process.source = cms.Source("EmptySource", firstRun = cms.untracked.uint32(1) diff --git a/HLTrigger/HLTcore/test/putHLTPrescaleTable.py b/HLTrigger/HLTcore/test/putHLTPrescaleTable.py index 33ee12872384b..8b4fbc849fb7e 100644 --- a/HLTrigger/HLTcore/test/putHLTPrescaleTable.py +++ b/HLTrigger/HLTcore/test/putHLTPrescaleTable.py @@ -3,7 +3,7 @@ process = cms.Process("PUT") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('HLTPrescaleRecorder') + process.source = cms.Source("EmptySource", firstRun = cms.untracked.uint32(1) diff --git a/HLTrigger/HLTfilters/test/HLTBeamModeFilter_cfg.py b/HLTrigger/HLTfilters/test/HLTBeamModeFilter_cfg.py index 827f4be719f77..559b9eb0b830e 100644 --- a/HLTrigger/HLTfilters/test/HLTBeamModeFilter_cfg.py +++ b/HLTrigger/HLTfilters/test/HLTBeamModeFilter_cfg.py @@ -94,9 +94,9 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['gtEvmDigis', 'hltBeamModeFilter'] -process.MessageLogger.categories.append('L1GlobalTriggerEvmRawToDigi') -process.MessageLogger.categories.append('HLTBeamModeFilter') -#process.MessageLogger.destinations = ['cerr'] + + +# process.MessageLogger.cerr.threshold = 'DEBUG' #process.MessageLogger.cerr.threshold = 'INFO' diff --git a/HLTrigger/HLTfilters/test/HLTLevel1GTSeed_cfg.py b/HLTrigger/HLTfilters/test/HLTLevel1GTSeed_cfg.py index d31da685ca171..fbafb9a56ea67 100644 --- a/HLTrigger/HLTfilters/test/HLTLevel1GTSeed_cfg.py +++ b/HLTrigger/HLTfilters/test/HLTLevel1GTSeed_cfg.py @@ -474,8 +474,8 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['hltLevel1GTSeed'] -process.MessageLogger.categories.append('HLTLevel1GTSeed') -#process.MessageLogger.destinations = ['cerr'] + +# process.MessageLogger.cerr.threshold = 'DEBUG' #process.MessageLogger.cerr.threshold = 'INFO' diff --git a/HLTrigger/Muon/test/hltMuonL1RegionalFilter_cfg.py b/HLTrigger/Muon/test/hltMuonL1RegionalFilter_cfg.py index 79932c92fd036..2bbdbc980db0a 100644 --- a/HLTrigger/Muon/test/hltMuonL1RegionalFilter_cfg.py +++ b/HLTrigger/Muon/test/hltMuonL1RegionalFilter_cfg.py @@ -40,7 +40,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = cms.untracked.vstring('HLTMuonL1RegionalFilter') -process.MessageLogger.categories = cms.untracked.vstring('HLTMuonL1RegionalFilter') + process.MessageLogger.cerr.threshold = cms.untracked.string('DEBUG') process.MessageLogger.cerr.DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ) diff --git a/HLTrigger/Timer/python/FastTimer.py b/HLTrigger/Timer/python/FastTimer.py index d336a8b529790..231748ef94504 100644 --- a/HLTrigger/Timer/python/FastTimer.py +++ b/HLTrigger/Timer/python/FastTimer.py @@ -58,7 +58,7 @@ def addPrint(process): # enable text dump if not hasattr(process,'MessageLogger'): process.load('FWCore.MessageService.MessageLogger_cfi') - process.MessageLogger.categories.append('FastReport') + process.MessageLogger.cerr.FastReport = cms.untracked.PSet( limit = cms.untracked.int32( 10000000 ) ) return process diff --git a/HLTrigger/special/test/testDynamicPrescaler.py b/HLTrigger/special/test/testDynamicPrescaler.py index a40a3e43ea0d5..ad5270c3bb775 100644 --- a/HLTrigger/special/test/testDynamicPrescaler.py +++ b/HLTrigger/special/test/testDynamicPrescaler.py @@ -17,7 +17,7 @@ process.hltTrigReport = cms.EDAnalyzer( "HLTrigReport", HLTriggerResults = cms.InputTag( 'TriggerResults' ) ) -process.MessageLogger.categories.append('HLTrigReport') + process.path = cms.Path(process.hltDynamicPrescaler) process.info = cms.EndPath(process.hltTrigReport) diff --git a/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py b/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py index c5847c582ff42..00ece86c8afbf 100644 --- a/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py +++ b/HLTriggerOffline/B2G/test/b2gHLTDQM_production_cfg.py @@ -74,7 +74,7 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('B2GSingleLeptonTriggerDQM' ) + process.MessageLogger.cerr.B2GSingleLeptonTriggerDQM = cms.untracked.PSet(limit = cms.untracked.int32(1)) diff --git a/HLTriggerOffline/Common/test/hltHarvesting_cfg.py b/HLTriggerOffline/Common/test/hltHarvesting_cfg.py index e2288037668ac..6d5db49ea786c 100644 --- a/HLTriggerOffline/Common/test/hltHarvesting_cfg.py +++ b/HLTriggerOffline/Common/test/hltHarvesting_cfg.py @@ -33,7 +33,7 @@ # Other statements #Adding DQMFileSaver to the message logger configuration -process.MessageLogger.categories.append('DQMFileSaver') + process.MessageLogger.cout.DQMFileSaver = cms.untracked.PSet( limit = cms.untracked.int32(1000000) ) diff --git a/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py b/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py index 49b941ace7988..7de4906c0b51c 100644 --- a/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py +++ b/HLTriggerOffline/Common/test/hltSourceHarvestCompare_cfg.py @@ -37,7 +37,7 @@ process.options = cms.untracked.PSet( fileMode = cms.untracked.string('FULLMERGE') ) -process.MessageLogger.categories.append('DQMFileSaver') + process.MessageLogger.cout.DQMFileSaver = cms.untracked.PSet( limit = cms.untracked.int32(1000000) ) diff --git a/HLTriggerOffline/Egamma/test/testEmDQM_cfg.py b/HLTriggerOffline/Egamma/test/testEmDQM_cfg.py index 5908ffa552380..29ed018304845 100644 --- a/HLTriggerOffline/Egamma/test/testEmDQM_cfg.py +++ b/HLTriggerOffline/Egamma/test/testEmDQM_cfg.py @@ -8,7 +8,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") # suppress printout of error messages on every event when a collection is missing in the event -process.MessageLogger.categories.append("EmDQMInvalidRefs") + process.MessageLogger.cerr.EmDQMInvalidRefs = cms.untracked.PSet(limit = cms.untracked.int32(5)) process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) diff --git a/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py b/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py index cf4fb99718b79..5c3a0cf169b2e 100644 --- a/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py +++ b/HLTriggerOffline/Exotica/test/hltExoticaValidator_cfg.py @@ -201,21 +201,19 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.destinations += ['ExoticaValidationMessages'] -process.MessageLogger.categories += ['ExoticaValidation'] + #process.MessageLogger.debugModules += ['HLTExoticaValidator','HLTExoticaSubAnalysis','HLTExoticaPlotter'] process.MessageLogger.debugModules += ['*'] -process.MessageLogger.ExoticaValidationMessages = cms.untracked.PSet( +process.MessageLogger.files.ExoticaValidationMessages = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ExoticaValidation = cms.untracked.PSet(limit = cms.untracked.int32(1000)) ) -process.MessageLogger.categories.extend(["GetManyWithoutRegistration","GetByLabelWithoutRegistration"]) + _messageSettings = cms.untracked.PSet( reportEvery = cms.untracked.int32(1), - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000000) ) diff --git a/HLTriggerOffline/HeavyFlavor/test/heavyFlavorValidation_cfg.py b/HLTriggerOffline/HeavyFlavor/test/heavyFlavorValidation_cfg.py index e7176894be894..fb6c389a1ab6a 100644 --- a/HLTriggerOffline/HeavyFlavor/test/heavyFlavorValidation_cfg.py +++ b/HLTriggerOffline/HeavyFlavor/test/heavyFlavorValidation_cfg.py @@ -37,7 +37,7 @@ #process.load("FWCore.MessageService.MessageLogger_cfi") #process.MessageLogger.debugModules = cms.untracked.vstring('heavyFlavorValidation') -#process.MessageLogger.categories = cms.untracked.vstring('HLTriggerOfflineHeavyFlavor') +# #process.MessageLogger.cerr.threshold = cms.untracked.string('DEBUG') #process.MessageLogger.cerr.DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ) diff --git a/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py b/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py index 14464a3e94e28..c9c03f54adf7e 100644 --- a/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py +++ b/HLTriggerOffline/Higgs/test/hltHiggsValidator_cfg.py @@ -54,10 +54,9 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 2000 -process.MessageLogger.destinations += ['HiggsValidationMessages'] -process.MessageLogger.categories += ['HiggsValidation'] + process.MessageLogger.debugModules += ['*']#HLTHiggsValidator','HLTHiggsSubAnalysis','HLTHiggsPlotter'] -process.MessageLogger.HiggsValidationMessages = cms.untracked.PSet( +process.MessageLogger.files.HiggsValidationMessages = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), HiggsValidation = cms.untracked.PSet(limit = cms.untracked.int32(1000)) diff --git a/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py b/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py index 9c165b852e96d..80f6ca9133e9f 100644 --- a/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py +++ b/HLTriggerOffline/Muon/test/hltMuonValidator_cfg.py @@ -40,10 +40,9 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 2000 -process.MessageLogger.destinations += ['HLTMuonValMessages'] -process.MessageLogger.categories += ['HLTMuonVal'] + process.MessageLogger.debugModules += ['HLTMuonValidator'] -process.MessageLogger.HLTMuonValMessages = cms.untracked.PSet( +process.MessageLogger.files.HLTMuonValMessages = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), HLTMuonVal = cms.untracked.PSet(limit = cms.untracked.int32(1000)) diff --git a/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py b/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py index 1a6e2dd928bb8..60d5d42731edc 100644 --- a/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py +++ b/HLTriggerOffline/SMP/test/hltSMPValidator_cfg.py @@ -32,10 +32,9 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 2000 -process.MessageLogger.destinations += ['SMPValidationMessages'] -process.MessageLogger.categories += ['SMPValidation'] + process.MessageLogger.debugModules += ['*']#HLTHiggsValidator','HLTHiggsSubAnalysis','HLTHiggsPlotter'] -process.MessageLogger.SMPValidationMessages = cms.untracked.PSet( +process.MessageLogger.files.SMPValidationMessages = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), SMPValidation = cms.untracked.PSet(limit = cms.untracked.int32(1000)) diff --git a/HLTriggerOffline/Tau/test/runHLTTauValidation_cfg.py b/HLTriggerOffline/Tau/test/runHLTTauValidation_cfg.py index 9d20c7e94cda5..badae5b95ce9c 100644 --- a/HLTriggerOffline/Tau/test/runHLTTauValidation_cfg.py +++ b/HLTriggerOffline/Tau/test/runHLTTauValidation_cfg.py @@ -5,7 +5,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.cerr.FwkReport.reportEvery = 100 -#process.MessageLogger.categories.append("HLTTauDQMOffline") +# process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) diff --git a/HeterogeneousCore/CUDAServices/test/testCUDAService.py b/HeterogeneousCore/CUDAServices/test/testCUDAService.py index 06edefcac2b66..941a264fa8198 100644 --- a/HeterogeneousCore/CUDAServices/test/testCUDAService.py +++ b/HeterogeneousCore/CUDAServices/test/testCUDAService.py @@ -4,7 +4,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('HeterogeneousCore.CUDAServices.CUDAService_cfi') -process.MessageLogger.categories.append("CUDAService") + process.source = cms.Source("EmptySource") diff --git a/HeterogeneousCore/MPIServices/test/testMPIService.py b/HeterogeneousCore/MPIServices/test/testMPIService.py index 2867133bc82be..c7b311ff43b48 100644 --- a/HeterogeneousCore/MPIServices/test/testMPIService.py +++ b/HeterogeneousCore/MPIServices/test/testMPIService.py @@ -4,7 +4,7 @@ process.load('FWCore.MessageService.MessageLogger_cfi') process.load('HeterogeneousCore.MPIServices.MPIService_cfi') -process.MessageLogger.categories.append("MPIService") + process.source = cms.Source("EmptySource") diff --git a/HeterogeneousCore/SonicTriton/test/tritonTest_cfg.py b/HeterogeneousCore/SonicTriton/test/tritonTest_cfg.py index 0646e527d16b0..65ea8ca4a51ec 100644 --- a/HeterogeneousCore/SonicTriton/test/tritonTest_cfg.py +++ b/HeterogeneousCore/SonicTriton/test/tritonTest_cfg.py @@ -64,10 +64,9 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 500 keep_msgs = [options.producer,options.producer+':TritonClient','TritonClient'] for msg in keep_msgs: - process.MessageLogger.categories.append(msg) + setattr(process.MessageLogger.cerr,msg, cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000000), ) ) diff --git a/IOMC/Input/test/testWriter_cfg.py b/IOMC/Input/test/testWriter_cfg.py index f9c593b44ad49..7961c875b260b 100644 --- a/IOMC/Input/test/testWriter_cfg.py +++ b/IOMC/Input/test/testWriter_cfg.py @@ -16,8 +16,8 @@ # The following three lines reduce the clutter of repeated printouts # of the same exception message. process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.destinations = ['cerr'] -process.MessageLogger.statistics = [] + + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(5)) diff --git a/L1Trigger/GlobalMuonTrigger/test/writeLUTsAndRegs_cfg.py b/L1Trigger/GlobalMuonTrigger/test/writeLUTsAndRegs_cfg.py index 42cce20447cff..354f447ab0907 100644 --- a/L1Trigger/GlobalMuonTrigger/test/writeLUTsAndRegs_cfg.py +++ b/L1Trigger/GlobalMuonTrigger/test/writeLUTsAndRegs_cfg.py @@ -4,7 +4,7 @@ process = cms.Process("LUTgen") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py index 46099d86d7fb0..81e638d55571f 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtAnalyzer_cfg.py @@ -156,20 +156,15 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtAnalyzer'] -process.MessageLogger.categories.append('L1GtAnalyzer') -process.MessageLogger.categories.append('L1GtUtils') -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.destinations = ['L1GtAnalyzer_error', - 'L1GtAnalyzer_warning', - 'L1GtAnalyzer_info', - 'L1GtAnalyzer_debug' - ] + + +process.MessageLogger.cerr.enable = False process.MessageLogger.cerr.default.limit = 0 process.MessageLogger.cerr.FwkReport.limit = 0 process.MessageLogger.cerr.FwkSummary.limit = 0 -process.MessageLogger.L1GtAnalyzer_debug = cms.untracked.PSet( +process.MessageLogger.files.L1GtAnalyzer_debug = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -180,7 +175,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(0) ) ) -process.MessageLogger.L1GtAnalyzer_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtAnalyzer_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -190,7 +185,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtAnalyzer_warning = cms.untracked.PSet( +process.MessageLogger.files.L1GtAnalyzer_warning = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -199,7 +194,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtAnalyzer_error = cms.untracked.PSet( +process.MessageLogger.files.L1GtAnalyzer_error = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GtAnalyzer = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtBeamModeFilter_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtBeamModeFilter_cfg.py index 7ca794f0a8a81..a74b6d7957160 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtBeamModeFilter_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtBeamModeFilter_cfg.py @@ -95,9 +95,9 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['gtEvmDigis', 'l1GtBeamModeFilter'] -process.MessageLogger.categories.append('L1GlobalTriggerEvmRawToDigi') -process.MessageLogger.categories.append('L1GtBeamModeFilter') -#process.MessageLogger.destinations = ['cerr'] + + +# process.MessageLogger.cerr.threshold = 'DEBUG' #process.MessageLogger.cerr.threshold = 'INFO' diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataEmulAnalyzer_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataEmulAnalyzer_cfg.py index 8f222b7cedfe2..ca9be397b6595 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataEmulAnalyzer_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataEmulAnalyzer_cfg.py @@ -194,9 +194,10 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( #limit = cms.untracked.int32(-1) diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataFromRawEmulAnalyzer_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataFromRawEmulAnalyzer_cfg.py index 74b599f3196dd..e8f34e607a643 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataFromRawEmulAnalyzer_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtDataFromRawEmulAnalyzer_cfg.py @@ -250,9 +250,10 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( #limit = cms.untracked.int32(-1) diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtEmulTrigReport_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtEmulTrigReport_cfg.py index 1c17583ea64f1..9f9c415cad7e6 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtEmulTrigReport_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtEmulTrigReport_cfg.py @@ -213,29 +213,24 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtEmulDigis', 'l1GtTrigReport'] -process.MessageLogger.categories.append('L1GlobalTrigger') -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.destinations = ['L1GtEmulTrigReport_errors', - 'L1GtEmulTrigReport_warnings', - 'L1GtEmulTrigReport_info', - 'L1GtEmulTrigReport' - ] -process.MessageLogger.statistics = [] - -process.MessageLogger.L1GtEmulTrigReport_errors = cms.untracked.PSet( + + +process.MessageLogger.cerr.enable = False + +process.MessageLogger.files.L1GtEmulTrigReport_errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GlobalTrigger = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtEmulTrigReport_warnings = cms.untracked.PSet( +process.MessageLogger.files.L1GtEmulTrigReport_warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), L1GlobalTrigger = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtEmulTrigReport_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtEmulTrigReport_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -243,7 +238,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtEmulTrigReport = cms.untracked.PSet( +process.MessageLogger.files.L1GtEmulTrigReport = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPackUnpackAnalyzer_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPackUnpackAnalyzer_cfg.py index 9894e55664da2..347179ad9629d 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPackUnpackAnalyzer_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPackUnpackAnalyzer_cfg.py @@ -221,8 +221,8 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = [ 'l1GtPack', 'l1GtUnpack', 'l1GtPackUnpackAnalyzer'] -process.MessageLogger.destinations = ['L1GtPackUnpackAnalyzer'] -process.MessageLogger.L1GtPackUnpackAnalyzer = cms.untracked.PSet( +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.L1GtPackUnpackAnalyzer = cms.untracked.PSet( threshold=cms.untracked.string('DEBUG'), #threshold = cms.untracked.string('INFO'), #threshold = cms.untracked.string('ERROR'), diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPatternGenerator_overrideL1Menu_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPatternGenerator_overrideL1Menu_cfg.py index e94db476a37a4..8ad881d755dd4 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPatternGenerator_overrideL1Menu_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtPatternGenerator_overrideL1Menu_cfg.py @@ -256,19 +256,14 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtPatternGenerator', 'gtDigis'] -process.MessageLogger.categories.append('L1GtPatternGenerator') -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.destinations = ['L1GtPatternGenerator_error', - 'L1GtPatternGenerator_warning', - 'L1GtPatternGenerator_info', - 'L1GtPatternGenerator_debug' - ] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cerr.default.limit = 0 process.MessageLogger.cerr.FwkReport.limit = 0 process.MessageLogger.cerr.FwkSummary.limit = 0 -process.MessageLogger.L1GtPatternGenerator_debug = cms.untracked.PSet( +process.MessageLogger.files.L1GtPatternGenerator_debug = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -278,7 +273,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(0) ) ) -process.MessageLogger.L1GtPatternGenerator_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtPatternGenerator_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -287,7 +282,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtPatternGenerator_warning = cms.untracked.PSet( +process.MessageLogger.files.L1GtPatternGenerator_warning = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -295,7 +290,7 @@ L1GtTrigReport = cms.untracked.PSet( limit = cms.untracked.int32(0) ) ) -process.MessageLogger.L1GtPatternGenerator_error = cms.untracked.PSet( +process.MessageLogger.files.L1GtPatternGenerator_error = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GtPatternGenerator = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTechTrigL1GtEmulTrigReport_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTechTrigL1GtEmulTrigReport_cfg.py index 3db588528b51b..43ae3056a7261 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTechTrigL1GtEmulTrigReport_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTechTrigL1GtEmulTrigReport_cfg.py @@ -274,7 +274,7 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtEmulDigis', 'l1GtTrigReport'] -process.MessageLogger.categories.append('L1GtTrigReport') + process.MessageLogger.cerr.threshold = 'DEBUG' #process.MessageLogger.cerr.threshold = 'INFO' diff --git a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTrigReport_cfg.py b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTrigReport_cfg.py index e388714b5634a..f90f62d03f272 100644 --- a/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTrigReport_cfg.py +++ b/L1Trigger/GlobalTriggerAnalyzer/test/L1GtTrigReport_cfg.py @@ -78,7 +78,7 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['l1GtTrigReport'] -process.MessageLogger.categories.append('L1GtTrigReport') + #process.MessageLogger.cerr.threshold = 'DEBUG' process.MessageLogger.cerr.threshold = 'INFO' diff --git a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py index 12d320d1ee80b..ffe5c87d1007a 100644 --- a/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py +++ b/L1Trigger/L1CaloTrigger/python/test_L1EGCrystalClusterEmulator_cfg.py @@ -7,7 +7,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load("FWCore.MessageService.MessageLogger_cfi") process.load('Configuration.EventContent.EventContent_cff') -process.MessageLogger.categories = cms.untracked.vstring('L1EGRateStudies', 'FwkReport') + process.MessageLogger.cerr.FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) ) diff --git a/L1Trigger/L1GctAnalyzer/test/gctErrorFilter_cfg.py b/L1Trigger/L1GctAnalyzer/test/gctErrorFilter_cfg.py index 2ff58be768dbf..251ad41668021 100644 --- a/L1Trigger/L1GctAnalyzer/test/gctErrorFilter_cfg.py +++ b/L1Trigger/L1GctAnalyzer/test/gctErrorFilter_cfg.py @@ -9,7 +9,7 @@ process = cms.Process('GctErrorFilter') process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('WARNING') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1Trigger/L1GctAnalyzer/test/gctLUTGenerator_cfg.py b/L1Trigger/L1GctAnalyzer/test/gctLUTGenerator_cfg.py index 1420f7deca7ba..4d65d97e660f5 100644 --- a/L1Trigger/L1GctAnalyzer/test/gctLUTGenerator_cfg.py +++ b/L1Trigger/L1GctAnalyzer/test/gctLUTGenerator_cfg.py @@ -20,7 +20,7 @@ # CMSSW config process = cms.Process("GctLUTGen") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('l1GctConfigDump') diff --git a/L1Trigger/L1GctAnalyzer/test/gctPatternTester_cfg.py b/L1Trigger/L1GctAnalyzer/test/gctPatternTester_cfg.py index 86fdb9478c494..cdebe945c79a1 100644 --- a/L1Trigger/L1GctAnalyzer/test/gctPatternTester_cfg.py +++ b/L1Trigger/L1GctAnalyzer/test/gctPatternTester_cfg.py @@ -7,7 +7,7 @@ process = cms.Process('GctPatternTester') process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1Trigger/L1TCalorimeter/test/generatePattern-Stage2MP.py b/L1Trigger/L1TCalorimeter/test/generatePattern-Stage2MP.py index 8f3e7e5e685e8..baa4cee98897f 100644 --- a/L1Trigger/L1TCalorimeter/test/generatePattern-Stage2MP.py +++ b/L1Trigger/L1TCalorimeter/test/generatePattern-Stage2MP.py @@ -143,16 +143,14 @@ # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dump): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet( + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/L1Trigger/L1TCommon/test/reEmul.py b/L1Trigger/L1TCommon/test/reEmul.py index 43e7ebca9fa0f..b5a56dd554c3a 100644 --- a/L1Trigger/L1TCommon/test/reEmul.py +++ b/L1Trigger/L1TCommon/test/reEmul.py @@ -142,9 +142,9 @@ # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') -process.MessageLogger.categories.append('L1TGlobalEvents') -process.MessageLogger.categories.append('l1t|Global') + + + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') # gt analyzer diff --git a/L1Trigger/L1TCommon/test/runL1T.py b/L1Trigger/L1TCommon/test/runL1T.py index 8954c5608c262..6b43288ea9f27 100644 --- a/L1Trigger/L1TCommon/test/runL1T.py +++ b/L1Trigger/L1TCommon/test/runL1T.py @@ -43,9 +43,9 @@ process.TFileService.fileName = cms.string('l1t_debug.root') # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') -process.MessageLogger.categories.append('L1TGlobalEvents') -process.MessageLogger.categories.append('l1t|Global') + + + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') diff --git a/L1Trigger/L1TGlobal/test/Raw2Digi_uGTEmulation.py b/L1Trigger/L1TGlobal/test/Raw2Digi_uGTEmulation.py index 246542ff5cae8..d722bfa11ff20 100644 --- a/L1Trigger/L1TGlobal/test/Raw2Digi_uGTEmulation.py +++ b/L1Trigger/L1TGlobal/test/Raw2Digi_uGTEmulation.py @@ -75,17 +75,15 @@ # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') -process.MessageLogger.categories.append('L1TGlobalEvents') + + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dump): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet( + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromDigi.py b/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromDigi.py index 6ad85e35b6bb8..ed8e7f15121f2 100644 --- a/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromDigi.py +++ b/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromDigi.py @@ -68,9 +68,9 @@ # enable debug message logging for our modules -#process.MessageLogger.categories.append('L1TCaloEvents') -#process.MessageLogger.categories.append('L1TGlobalEvents') -#process.MessageLogger.categories.append('l1t|Global') +# +# +# process.MessageLogger.debugModules = cms.untracked.vstring('simGlobalStage2Digis') process.MessageLogger.cerr.threshold = cms.untracked.string('DEBUG') diff --git a/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromRAW.py b/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromRAW.py index 63fc991f6c63d..1eb4e74cc0352 100644 --- a/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromRAW.py +++ b/L1Trigger/L1TGlobal/test/l1tGlobalEmulation_FromRAW.py @@ -130,16 +130,14 @@ process.TFileService.fileName = cms.string('l1tCalo_2016_histos.root') # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dumpRaw): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet( + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/L1Trigger/L1TGlobal/test/raw2l1.py b/L1Trigger/L1TGlobal/test/raw2l1.py index d0d3228f674f5..22aa6ac134bc0 100644 --- a/L1Trigger/L1TGlobal/test/raw2l1.py +++ b/L1Trigger/L1TGlobal/test/raw2l1.py @@ -61,7 +61,7 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 1 else: process.MessageLogger.cerr.FwkReport.reportEvery = 100 -process.MessageLogger.categories.append('L1GtTrigReport') + process.maxEvents = cms.untracked.PSet(input = cms.untracked.int32(n)) diff --git a/L1Trigger/L1TGlobal/test/runGTSummary.py b/L1Trigger/L1TGlobal/test/runGTSummary.py index 80d793ab9866a..7648746913cd6 100644 --- a/L1Trigger/L1TGlobal/test/runGTSummary.py +++ b/L1Trigger/L1TGlobal/test/runGTSummary.py @@ -15,7 +15,7 @@ ##process.load('L1Trigger/L1TGlobal/debug_messages_cfi') ## process.MessageLogger.l1t_debug.l1t.limit = cms.untracked.int32(100000) -#process.MessageLogger.categories.append('l1t|Global') +# #process.MessageLogger.debugModules = cms.untracked.vstring('*') #process.MessageLogger.cerr.threshold = cms.untracked.string('DEBUG') diff --git a/L1Trigger/L1TGlobal/test/runGlobalFakeInputProducer.py b/L1Trigger/L1TGlobal/test/runGlobalFakeInputProducer.py index 2010bb6b04e07..c5f765c2a74ab 100644 --- a/L1Trigger/L1TGlobal/test/runGlobalFakeInputProducer.py +++ b/L1Trigger/L1TGlobal/test/runGlobalFakeInputProducer.py @@ -65,7 +65,7 @@ process.load('L1Trigger/L1TGlobal/debug_messages_cfi') process.MessageLogger.l1t_debug.l1t.limit = cms.untracked.int32(100000) -#process.MessageLogger.categories.append('l1t|Global') +# #process.MessageLogger.debugModules = cms.untracked.vstring('*') #process.MessageLogger.cerr.threshold = cms.untracked.string('DEBUG') @@ -292,7 +292,7 @@ process.l1GtTrigReport.PrintVerbosity = 2 process.report = cms.Path(process.l1GtTrigReport) -process.MessageLogger.categories.append("MuConditon") + if useMCtoGT: process.gtInput = process.mcL1GTinput.clone() diff --git a/L1Trigger/L1TGlobal/test/unpackBuffers-CaloStage2_uGTEmulation.py b/L1Trigger/L1TGlobal/test/unpackBuffers-CaloStage2_uGTEmulation.py index f1fca870b2895..578fa6c4de85b 100644 --- a/L1Trigger/L1TGlobal/test/unpackBuffers-CaloStage2_uGTEmulation.py +++ b/L1Trigger/L1TGlobal/test/unpackBuffers-CaloStage2_uGTEmulation.py @@ -148,18 +148,16 @@ # enable debug message logging for our modules -process.MessageLogger.categories.append('L1TCaloEvents') -process.MessageLogger.categories.append('L1TGlobalEvents') -process.MessageLogger.categories.append('Global') + + + process.MessageLogger.suppressInfo = cms.untracked.vstring('Geometry', 'AfterSource') if (options.dump): - process.MessageLogger.destinations.append('infos') - process.MessageLogger.infos = cms.untracked.PSet( + process.MessageLogger.files.infos = cms.untracked.PSet( INFO = cms.untracked.PSet(limit = cms.untracked.int32(0)), L1TCaloEvents = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000) ) ) diff --git a/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerCosmics_cfg.py b/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerCosmics_cfg.py index ae438262e6f51..e01697852c595 100644 --- a/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerCosmics_cfg.py +++ b/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerCosmics_cfg.py @@ -9,9 +9,10 @@ process = cms.Process("RPCTechnicalTrigger") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('DEBUG'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) diff --git a/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerData_cfg.py b/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerData_cfg.py index 6e58b7af4d81e..ffda9058be254 100644 --- a/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerData_cfg.py +++ b/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTriggerData_cfg.py @@ -9,9 +9,10 @@ process = cms.Process("RPCTechnicalTrigger") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('DEBUG'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) diff --git a/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTrigger_cfg.py b/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTrigger_cfg.py index 0e2f6a65c930e..b40d4948e9b0e 100644 --- a/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTrigger_cfg.py +++ b/L1Trigger/RPCTechnicalTrigger/test/rpcTechnicalTrigger_cfg.py @@ -9,9 +9,10 @@ process = cms.Process("RPCTechnicalTrigger") process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('DEBUG'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) diff --git a/L1Trigger/TrackFindingTMTT/test/L1TrackNtupleMaker_cfg.py b/L1Trigger/TrackFindingTMTT/test/L1TrackNtupleMaker_cfg.py index 733453e741bbc..6564e87e86a01 100644 --- a/L1Trigger/TrackFindingTMTT/test/L1TrackNtupleMaker_cfg.py +++ b/L1Trigger/TrackFindingTMTT/test/L1TrackNtupleMaker_cfg.py @@ -32,8 +32,8 @@ process.load('Configuration.StandardSequences.Services_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append('L1track') -process.MessageLogger.categories.append('Tracklet') + + process.load('Configuration.EventContent.EventContent_cff') process.load('Configuration.StandardSequences.MagneticField_cff') diff --git a/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py b/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py index 60807b026a2f4..e16e64a5661d4 100644 --- a/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py +++ b/L1Trigger/TrackFindingTMTT/test/tmtt_tf_analysis_cfg.py @@ -26,7 +26,7 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('L1track') + process.MessageLogger.L1track = cms.untracked.PSet(limit = cms.untracked.int32(-1)) options = VarParsing.VarParsing ('analysis') diff --git a/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py b/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py index c7f6f3786a354..595d9c1f5bc69 100644 --- a/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py +++ b/L1Trigger/TrackFindingTracklet/test/L1TrackNtupleMaker_cfg.py @@ -25,8 +25,8 @@ process.load('Configuration.StandardSequences.MagneticField_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.categories.append('Tracklet') -process.MessageLogger.categories.append('L1track') + + process.MessageLogger.Tracklet = cms.untracked.PSet(limit = cms.untracked.int32(-1)) if GEOMETRY == "D49": diff --git a/L1TriggerConfig/CSCTFConfigProducers/test/analyzerFakeProducer.py b/L1TriggerConfig/CSCTFConfigProducers/test/analyzerFakeProducer.py index f97b96c6ffd14..c1f82962963be 100644 --- a/L1TriggerConfig/CSCTFConfigProducers/test/analyzerFakeProducer.py +++ b/L1TriggerConfig/CSCTFConfigProducers/test/analyzerFakeProducer.py @@ -6,7 +6,7 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) ) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/CSCTFConfigProducers/test/testEmulator.py b/L1TriggerConfig/CSCTFConfigProducers/test/testEmulator.py index 4a9b293f481ea..8ebf3b9c182ac 100644 --- a/L1TriggerConfig/CSCTFConfigProducers/test/testEmulator.py +++ b/L1TriggerConfig/CSCTFConfigProducers/test/testEmulator.py @@ -32,9 +32,10 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['*'] -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), DEBUG=cms.untracked.PSet( limit=cms.untracked.int32(-1) diff --git a/L1TriggerConfig/CSCTFConfigProducers/test/testEmulatorFromSQLite.py b/L1TriggerConfig/CSCTFConfigProducers/test/testEmulatorFromSQLite.py index 12d5faba41325..cc3f744b709f1 100644 --- a/L1TriggerConfig/CSCTFConfigProducers/test/testEmulatorFromSQLite.py +++ b/L1TriggerConfig/CSCTFConfigProducers/test/testEmulatorFromSQLite.py @@ -66,9 +66,10 @@ # Message Logger process.load('FWCore.MessageService.MessageLogger_cfi') process.MessageLogger.debugModules = ['*'] -process.MessageLogger.categories = ['*'] -process.MessageLogger.destinations = ['cout'] + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), DEBUG=cms.untracked.PSet( limit=cms.untracked.int32(-1) diff --git a/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_csctf_cfg.py b/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_csctf_cfg.py index 209f150f2e7c1..6dc4092c260dd 100644 --- a/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_csctf_cfg.py +++ b/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_csctf_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_ptlut_cfg.py b/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_ptlut_cfg.py index 9086fdc78816f..29689015f5d18 100644 --- a/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_ptlut_cfg.py +++ b/L1TriggerConfig/CSCTFConfigProducers/test/testO2O_ptlut_cfg.py @@ -3,7 +3,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/CSCTFConfigProducers/test/writeCSCTFPayload.py b/L1TriggerConfig/CSCTFConfigProducers/test/writeCSCTFPayload.py index f6421a8b0465d..7cb9ef8b06606 100644 --- a/L1TriggerConfig/CSCTFConfigProducers/test/writeCSCTFPayload.py +++ b/L1TriggerConfig/CSCTFConfigProducers/test/writeCSCTFPayload.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/DTTrackFinder/test/testOnlineProdMasks_cfg.py b/L1TriggerConfig/DTTrackFinder/test/testOnlineProdMasks_cfg.py index bca1557f12958..c1bdeac679de7 100644 --- a/L1TriggerConfig/DTTrackFinder/test/testOnlineProdMasks_cfg.py +++ b/L1TriggerConfig/DTTrackFinder/test/testOnlineProdMasks_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/DTTrackFinder/test/testOnlineProdParameters_cfg.py b/L1TriggerConfig/DTTrackFinder/test/testOnlineProdParameters_cfg.py index 777436654adb2..388c8cf1698a2 100644 --- a/L1TriggerConfig/DTTrackFinder/test/testOnlineProdParameters_cfg.py +++ b/L1TriggerConfig/DTTrackFinder/test/testOnlineProdParameters_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/GMTConfigProducers/test/minitestRS_cfg.py b/L1TriggerConfig/GMTConfigProducers/test/minitestRS_cfg.py index 977ab00ae6df0..4a18afd3a9192 100644 --- a/L1TriggerConfig/GMTConfigProducers/test/minitestRS_cfg.py +++ b/L1TriggerConfig/GMTConfigProducers/test/minitestRS_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/GMTConfigProducers/test/minitest_cfg.py b/L1TriggerConfig/GMTConfigProducers/test/minitest_cfg.py index 12c13f00c2c82..e82f77555eb5d 100644 --- a/L1TriggerConfig/GMTConfigProducers/test/minitest_cfg.py +++ b/L1TriggerConfig/GMTConfigProducers/test/minitest_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/GMTConfigProducers/test/writeLUTsAndRegs_cfg.py b/L1TriggerConfig/GMTConfigProducers/test/writeLUTsAndRegs_cfg.py index df8a68ef5dcdc..6505785493ec2 100644 --- a/L1TriggerConfig/GMTConfigProducers/test/writeLUTsAndRegs_cfg.py +++ b/L1TriggerConfig/GMTConfigProducers/test/writeLUTsAndRegs_cfg.py @@ -27,7 +27,7 @@ #) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/GctConfigProducers/test/test-config-print.py b/L1TriggerConfig/GctConfigProducers/test/test-config-print.py index 1beb01f16c31e..8dc00ba6ff3c0 100644 --- a/L1TriggerConfig/GctConfigProducers/test/test-config-print.py +++ b/L1TriggerConfig/GctConfigProducers/test/test-config-print.py @@ -30,7 +30,7 @@ # the job process = cms.Process("L1GctConfigDump") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('l1GctConfigDump') diff --git a/L1TriggerConfig/GctConfigProducers/test/test-o2o-print.py b/L1TriggerConfig/GctConfigProducers/test/test-o2o-print.py index 2711f66989915..271440555b065 100644 --- a/L1TriggerConfig/GctConfigProducers/test/test-o2o-print.py +++ b/L1TriggerConfig/GctConfigProducers/test/test-o2o-print.py @@ -12,7 +12,7 @@ # CMSSW config process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('l1GctConfigDump') diff --git a/L1TriggerConfig/GctConfigProducers/test/test-o2o-rs.py b/L1TriggerConfig/GctConfigProducers/test/test-o2o-rs.py index 3076a50b09a81..0dbc9af996bd3 100644 --- a/L1TriggerConfig/GctConfigProducers/test/test-o2o-rs.py +++ b/L1TriggerConfig/GctConfigProducers/test/test-o2o-rs.py @@ -11,7 +11,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtOnlineWriteSqlTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtOnlineWriteSqlTest_cfg.py index 13407aca036d2..57935a6762912 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtOnlineWriteSqlTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtOnlineWriteSqlTest_cfg.py @@ -44,7 +44,7 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtParametersOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtParametersOnlineTest_cfg.py index 432584184350d..4a54cfae4c595 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtParametersOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtParametersOnlineTest_cfg.py @@ -42,7 +42,7 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsAlgoTrigOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsAlgoTrigOnlineTest_cfg.py index ced9626751280..dc980c210589d 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsAlgoTrigOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsAlgoTrigOnlineTest_cfg.py @@ -37,6 +37,6 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsTechTrigOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsTechTrigOnlineTest_cfg.py index c3a0fd53d8987..6f976f560fad4 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsTechTrigOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtPrescaleFactorsTechTrigOnlineTest_cfg.py @@ -37,6 +37,6 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtPsbSetupOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtPsbSetupOnlineTest_cfg.py index f021c3666d9d7..ac498382cc02d 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtPsbSetupOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtPsbSetupOnlineTest_cfg.py @@ -42,7 +42,7 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTester_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTester_cfg.py index 8ed6a6774c397..2fe13a88b5f7b 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTester_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTester_cfg.py @@ -128,28 +128,23 @@ # services # Message Logger -process.MessageLogger.categories.append('L1GtPrescaleFactorsAndMasksTester') -process.MessageLogger.destinations = ['L1GtTester_errors', - 'L1GtTester_warnings', - 'L1GtTester_info', - 'L1GtTester_debug' - ] -process.MessageLogger.statistics = [] - -process.MessageLogger.L1GtTester_errors = cms.untracked.PSet( + +process.MessageLogger.cerr.enable = False + +process.MessageLogger.files.L1GtTester_errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GtPrescaleFactorsAndMasksTester = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTester_warnings = cms.untracked.PSet( +process.MessageLogger.files.L1GtTester_warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), L1GtPrescaleFactorsAndMasksTester = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTester_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtTester_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -157,7 +152,7 @@ L1GtPrescaleFactorsAndMasksTester = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTester_debug = cms.untracked.PSet( +process.MessageLogger.files.L1GtTester_debug = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskAlgoTrigOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskAlgoTrigOnlineTest_cfg.py index 9abcb25b2b49f..760cdb3d173ab 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskAlgoTrigOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskAlgoTrigOnlineTest_cfg.py @@ -41,6 +41,6 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskTechTrigOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskTechTrigOnlineTest_cfg.py index 3767ec980324c..a531a0ccc005f 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskTechTrigOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskTechTrigOnlineTest_cfg.py @@ -41,6 +41,6 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskVetoTechTrigOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskVetoTechTrigOnlineTest_cfg.py index 8b7be1d11ddff..7ad0f64a94ce7 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskVetoTechTrigOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMaskVetoTechTrigOnlineTest_cfg.py @@ -41,6 +41,6 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuOnlineTest_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuOnlineTest_cfg.py index 1cb47fc283c10..c5b3dc060e8af 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuOnlineTest_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuOnlineTest_cfg.py @@ -80,7 +80,7 @@ # Message Logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py index 7703a055b38d3..56a441646300e 100644 --- a/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py +++ b/L1TriggerConfig/L1GtConfigProducers/test/L1GtTriggerMenuTester_cfg.py @@ -110,30 +110,24 @@ # Message Logger process.MessageLogger.debugModules = ['l1GtTriggerMenuTester'] -process.MessageLogger.categories.append('L1GtTriggerMenuTester') -process.MessageLogger.categories.append('L1GtTriggerMenuTesterWiki') -process.MessageLogger.destinations = ['L1GtTriggerMenuTester_errors', - 'L1GtTriggerMenuTester_warnings', - 'L1GtTriggerMenuTester_info', - 'L1GtTriggerMenuTester_wiki', - 'L1GtTriggerMenuTester_debug' - ] -process.MessageLogger.statistics = [] - -process.MessageLogger.L1GtTriggerMenuTester_errors = cms.untracked.PSet( + + +process.MessageLogger.cerr.enable = False + +process.MessageLogger.files.L1GtTriggerMenuTester_errors = cms.untracked.PSet( threshold = cms.untracked.string('ERROR'), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), L1GtTriggerMenuTester = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTriggerMenuTester_warnings = cms.untracked.PSet( +process.MessageLogger.files.L1GtTriggerMenuTester_warnings = cms.untracked.PSet( threshold = cms.untracked.string('WARNING'), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), ERROR = cms.untracked.PSet( limit = cms.untracked.int32(0) ), L1GtTriggerMenuTester = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTriggerMenuTester_info = cms.untracked.PSet( +process.MessageLogger.files.L1GtTriggerMenuTester_info = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -141,7 +135,7 @@ L1GtTriggerMenuTester = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTriggerMenuTester_wiki = cms.untracked.PSet( +process.MessageLogger.files.L1GtTriggerMenuTester_wiki = cms.untracked.PSet( threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), WARNING = cms.untracked.PSet( limit = cms.untracked.int32(0) ), @@ -149,7 +143,7 @@ L1GtTriggerMenuTesterWiki = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) ) -process.MessageLogger.L1GtTriggerMenuTester_debug = cms.untracked.PSet( +process.MessageLogger.files.L1GtTriggerMenuTester_debug = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( limit = cms.untracked.int32(0) ), INFO = cms.untracked.PSet( limit = cms.untracked.int32(0) ), diff --git a/L1TriggerConfig/L1ScalesProducers/test/minitest_cfg.py b/L1TriggerConfig/L1ScalesProducers/test/minitest_cfg.py index c75ffa3d1de64..9d86a1048d0f8 100644 --- a/L1TriggerConfig/L1ScalesProducers/test/minitest_cfg.py +++ b/L1TriggerConfig/L1ScalesProducers/test/minitest_cfg.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/RCTConfigProducers/test/L1RCT_RunSettings.py b/L1TriggerConfig/RCTConfigProducers/test/L1RCT_RunSettings.py index 97a48b52ebdca..7b0fbe931a810 100644 --- a/L1TriggerConfig/RCTConfigProducers/test/L1RCT_RunSettings.py +++ b/L1TriggerConfig/RCTConfigProducers/test/L1RCT_RunSettings.py @@ -3,7 +3,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/RCTConfigProducers/test/test-tsc-o2o.py b/L1TriggerConfig/RCTConfigProducers/test/test-tsc-o2o.py index 5fbcfb6eaa1a3..cd4d9f391960b 100644 --- a/L1TriggerConfig/RCTConfigProducers/test/test-tsc-o2o.py +++ b/L1TriggerConfig/RCTConfigProducers/test/test-tsc-o2o.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpAll.py b/L1TriggerConfig/Utilities/test/dumpAll.py index 37d40f1f89305..e08f4f08e1d7a 100644 --- a/L1TriggerConfig/Utilities/test/dumpAll.py +++ b/L1TriggerConfig/Utilities/test/dumpAll.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpECpar.py b/L1TriggerConfig/Utilities/test/dumpECpar.py index 87b2006c37d7c..3ddf08cee5c86 100644 --- a/L1TriggerConfig/Utilities/test/dumpECpar.py +++ b/L1TriggerConfig/Utilities/test/dumpECpar.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TCaloParams.py b/L1TriggerConfig/Utilities/test/dumpL1TCaloParams.py index f1020097cb8d9..a80881e3529ea 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TCaloParams.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TCaloParams.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TGlobalPrescalesVetos.py b/L1TriggerConfig/Utilities/test/dumpL1TGlobalPrescalesVetos.py index 40e6a9fcf8b77..cefd2493675e1 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TGlobalPrescalesVetos.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TGlobalPrescalesVetos.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TMuonBarrelParams.py b/L1TriggerConfig/Utilities/test/dumpL1TMuonBarrelParams.py index 13cdd7283ba1a..4bd078392d42d 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TMuonBarrelParams.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TMuonBarrelParams.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TMuonEndCapParams.py b/L1TriggerConfig/Utilities/test/dumpL1TMuonEndCapParams.py index 655eb0e3abc88..43db60d9b4284 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TMuonEndCapParams.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TMuonEndCapParams.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TMuonGlobalParams.py b/L1TriggerConfig/Utilities/test/dumpL1TMuonGlobalParams.py index 0c609ff20deb4..4cddfa87f517c 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TMuonGlobalParams.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TMuonGlobalParams.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TMuonOverlapParams.py b/L1TriggerConfig/Utilities/test/dumpL1TMuonOverlapParams.py index 48350a74750ce..f850fb45d7f29 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TMuonOverlapParams.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TMuonOverlapParams.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpL1TUtmTriggerMenu.py b/L1TriggerConfig/Utilities/test/dumpL1TUtmTriggerMenu.py index 056fef6a6568a..744812e3eac3a 100644 --- a/L1TriggerConfig/Utilities/test/dumpL1TUtmTriggerMenu.py +++ b/L1TriggerConfig/Utilities/test/dumpL1TUtmTriggerMenu.py @@ -4,7 +4,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpMenu.py b/L1TriggerConfig/Utilities/test/dumpMenu.py index 53113256b5696..a9c4bb6781cd2 100644 --- a/L1TriggerConfig/Utilities/test/dumpMenu.py +++ b/L1TriggerConfig/Utilities/test/dumpMenu.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/dumpOverPar.py b/L1TriggerConfig/Utilities/test/dumpOverPar.py index e9b7bec010e87..b429053e94e33 100644 --- a/L1TriggerConfig/Utilities/test/dumpOverPar.py +++ b/L1TriggerConfig/Utilities/test/dumpOverPar.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/fetchMenu.py b/L1TriggerConfig/Utilities/test/fetchMenu.py index 97a42e0ac145e..1d70fb95372c3 100644 --- a/L1TriggerConfig/Utilities/test/fetchMenu.py +++ b/L1TriggerConfig/Utilities/test/fetchMenu.py @@ -2,7 +2,7 @@ process = cms.Process("L1ConfigWritePayloadDummy") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/fetchMenuKeyList.py b/L1TriggerConfig/Utilities/test/fetchMenuKeyList.py index 01f43e824b6ad..82584f36b6051 100644 --- a/L1TriggerConfig/Utilities/test/fetchMenuKeyList.py +++ b/L1TriggerConfig/Utilities/test/fetchMenuKeyList.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/updateCaloParams.py b/L1TriggerConfig/Utilities/test/updateCaloParams.py index d8a3b75769778..f45a2b25cf5b6 100644 --- a/L1TriggerConfig/Utilities/test/updateCaloParams.py +++ b/L1TriggerConfig/Utilities/test/updateCaloParams.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/uploadBmtfParams.py b/L1TriggerConfig/Utilities/test/uploadBmtfParams.py index 555f12287cb57..ab38f340ebed5 100644 --- a/L1TriggerConfig/Utilities/test/uploadBmtfParams.py +++ b/L1TriggerConfig/Utilities/test/uploadBmtfParams.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/uploadCaloParams.py b/L1TriggerConfig/Utilities/test/uploadCaloParams.py index ccc738fb1bdab..4fce53a24f888 100644 --- a/L1TriggerConfig/Utilities/test/uploadCaloParams.py +++ b/L1TriggerConfig/Utilities/test/uploadCaloParams.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/uploadEmtfForest.py b/L1TriggerConfig/Utilities/test/uploadEmtfForest.py index f3d597e9396ab..0126a34c74ff0 100644 --- a/L1TriggerConfig/Utilities/test/uploadEmtfForest.py +++ b/L1TriggerConfig/Utilities/test/uploadEmtfForest.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/uploadEmtfParams.py b/L1TriggerConfig/Utilities/test/uploadEmtfParams.py index ce49b57b6a651..408340a5fe087 100644 --- a/L1TriggerConfig/Utilities/test/uploadEmtfParams.py +++ b/L1TriggerConfig/Utilities/test/uploadEmtfParams.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/uploadGmtParams.py b/L1TriggerConfig/Utilities/test/uploadGmtParams.py index 22eff0c514db4..1f1897dd8e413 100644 --- a/L1TriggerConfig/Utilities/test/uploadGmtParams.py +++ b/L1TriggerConfig/Utilities/test/uploadGmtParams.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewAll.py b/L1TriggerConfig/Utilities/test/viewAll.py index 1b9e0dc47add2..bdf112e77bedc 100644 --- a/L1TriggerConfig/Utilities/test/viewAll.py +++ b/L1TriggerConfig/Utilities/test/viewAll.py @@ -2,7 +2,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewCaloParams.py b/L1TriggerConfig/Utilities/test/viewCaloParams.py index ab8020c2ff6b6..20f6f36888109 100644 --- a/L1TriggerConfig/Utilities/test/viewCaloParams.py +++ b/L1TriggerConfig/Utilities/test/viewCaloParams.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewECpar.py b/L1TriggerConfig/Utilities/test/viewECpar.py index b30e5e0ea0058..7ab215bf5524b 100644 --- a/L1TriggerConfig/Utilities/test/viewECpar.py +++ b/L1TriggerConfig/Utilities/test/viewECpar.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewGlobalMuon.py b/L1TriggerConfig/Utilities/test/viewGlobalMuon.py index 69edef4867bfc..306590483fbbf 100644 --- a/L1TriggerConfig/Utilities/test/viewGlobalMuon.py +++ b/L1TriggerConfig/Utilities/test/viewGlobalMuon.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewMenu.py b/L1TriggerConfig/Utilities/test/viewMenu.py index 75fa64e7a936b..0eab96ce70816 100644 --- a/L1TriggerConfig/Utilities/test/viewMenu.py +++ b/L1TriggerConfig/Utilities/test/viewMenu.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewOverPar.py b/L1TriggerConfig/Utilities/test/viewOverPar.py index 6494f758259e8..145282241e26f 100644 --- a/L1TriggerConfig/Utilities/test/viewOverPar.py +++ b/L1TriggerConfig/Utilities/test/viewOverPar.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewPrescalesVetos.py b/L1TriggerConfig/Utilities/test/viewPrescalesVetos.py index 66ae144dc5fc2..61a4a46f49b5e 100644 --- a/L1TriggerConfig/Utilities/test/viewPrescalesVetos.py +++ b/L1TriggerConfig/Utilities/test/viewPrescalesVetos.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewTKE.py b/L1TriggerConfig/Utilities/test/viewTKE.py index f2f923c00ddb7..b9becc392030b 100644 --- a/L1TriggerConfig/Utilities/test/viewTKE.py +++ b/L1TriggerConfig/Utilities/test/viewTKE.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewTKEonline.py b/L1TriggerConfig/Utilities/test/viewTKEonline.py index 2443521f022b1..70690c52e56b8 100644 --- a/L1TriggerConfig/Utilities/test/viewTKEonline.py +++ b/L1TriggerConfig/Utilities/test/viewTKEonline.py @@ -3,7 +3,7 @@ process = cms.Process("QWE") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('INFO') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/L1TriggerConfig/Utilities/test/viewTKLE.py b/L1TriggerConfig/Utilities/test/viewTKLE.py index 368b7d6508690..f20105361001a 100644 --- a/L1TriggerConfig/Utilities/test/viewTKLE.py +++ b/L1TriggerConfig/Utilities/test/viewTKLE.py @@ -3,7 +3,7 @@ process = cms.Process("tester") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py b/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py index b2e3a79d5f904..7e4cc5b4271af 100644 --- a/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py +++ b/MuonAnalysis/MomentumScaleCalibration/test/tree_production/miniAODVBTFMuonsOnlyTreeMC_CRAB_cfg.py @@ -42,7 +42,6 @@ # Messages process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 500 from CondCore.DBCommon.CondDBSetup_cfi import * diff --git a/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/test.py b/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/test.py index 576f3d5447840..e4bd447d8e916 100644 --- a/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/test.py +++ b/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/test.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testAnyBX.py b/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testAnyBX.py index c05f91dd7818f..495f1af09d3a1 100644 --- a/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testAnyBX.py +++ b/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testAnyBX.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testCRAFT.py b/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testCRAFT.py index b0a1d8ea0c2c7..dd5518b59ddd0 100644 --- a/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testCRAFT.py +++ b/MuonAnalysis/MuonAssociators/test/L1MuonMatcher/testCRAFT.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/debugMuonsClassByHits_cfg.py b/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/debugMuonsClassByHits_cfg.py index 3508cbfb87a95..e53d0b19093f8 100644 --- a/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/debugMuonsClassByHits_cfg.py +++ b/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/debugMuonsClassByHits_cfg.py @@ -63,9 +63,8 @@ process.classByHits ) -process.MessageLogger.categories += [ 'MuonMCClassifier' ] + process.MessageLogger.cerr.MuonMCClassifier = cms.untracked.PSet( - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000000) ) diff --git a/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py b/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py index b435c21af2842..6e7533fe693d6 100644 --- a/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py +++ b/MuonAnalysis/MuonAssociators/test/MuonMCClassifier/testClassByHitsTP_cfg.py @@ -63,10 +63,6 @@ process = setCrossingFrameOn(process) ###### -process.MessageLogger.categories = cms.untracked.vstring('MuonToTrackingParticleAssociatorEDProducer', -'MuonToTrackingParticleAssociatorByHits','MuonAssociatorByHitsHelper','MuonToTrackingParticleAssociatorByHitsImpl', -'TrackerMuonHitExtractor','MuonMCClassifier', -'FwkJob','FwkReport','FwkSummary','Root_NoDictionary') process.MessageLogger.cerr = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True), @@ -91,6 +87,7 @@ ) process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), noTimeStamps = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), diff --git a/PhysicsTools/HepMCCandAlgos/test/testFlavorHistoryProducer.py b/PhysicsTools/HepMCCandAlgos/test/testFlavorHistoryProducer.py index 4abda8ef92453..7515538162504 100644 --- a/PhysicsTools/HepMCCandAlgos/test/testFlavorHistoryProducer.py +++ b/PhysicsTools/HepMCCandAlgos/test/testFlavorHistoryProducer.py @@ -16,7 +16,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATLayer0Summary') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ) ) diff --git a/PhysicsTools/HepMCCandAlgos/test/testParticleTreeDrawer.py b/PhysicsTools/HepMCCandAlgos/test/testParticleTreeDrawer.py index 832d1b2511a44..ce4b3019ee0ca 100644 --- a/PhysicsTools/HepMCCandAlgos/test/testParticleTreeDrawer.py +++ b/PhysicsTools/HepMCCandAlgos/test/testParticleTreeDrawer.py @@ -29,6 +29,5 @@ process.p = cms.Path(process.printTree1*process.printTree2) process.outpath = cms.EndPath(process.printEventNumber) -process.MessageLogger.destinations = cms.untracked.vstring('cout','cerr') diff --git a/PhysicsTools/JetExamples/test/printGenJetRatio.py b/PhysicsTools/JetExamples/test/printGenJetRatio.py index 020c356cc193d..daf4acc2acf88 100644 --- a/PhysicsTools/JetExamples/test/printGenJetRatio.py +++ b/PhysicsTools/JetExamples/test/printGenJetRatio.py @@ -54,7 +54,7 @@ process.p = cms.Path(process.generator*process.pgen*process.printList*process.BCRatio*process.printEvent) -process.MessageLogger.destinations = cms.untracked.vstring('cout','cerr') #process.MessageLogger.cout = cms.PSet( +# enable = cms.untracked.bool(True), # threshold = cms.untracked.string('ERROR') #) diff --git a/PhysicsTools/JetExamples/test/printJetFlavour.py b/PhysicsTools/JetExamples/test/printJetFlavour.py index 571894d50690e..7616f27ca3610 100644 --- a/PhysicsTools/JetExamples/test/printJetFlavour.py +++ b/PhysicsTools/JetExamples/test/printJetFlavour.py @@ -50,9 +50,6 @@ process.p = cms.Path(process.printList*process.myPartons*process.flavourByRef*process.flavourByVal*process.printEvent) -process.MessageLogger.destinations = cms.untracked.vstring('cout','cerr') -#process.MessageLogger.cout = cms.PSet( -# threshold = cms.untracked.string('ERROR') -#) +#process.MessageLogger.cout = dict(enable = True, threshold = 'ERROR') diff --git a/PhysicsTools/JetExamples/test/printJetFlavourInfo.py b/PhysicsTools/JetExamples/test/printJetFlavourInfo.py index f92c43e1a9608..fc8265fbb8fe0 100644 --- a/PhysicsTools/JetExamples/test/printJetFlavourInfo.py +++ b/PhysicsTools/JetExamples/test/printJetFlavourInfo.py @@ -133,7 +133,4 @@ *(process.ca15PFJets+process.caHEPTopTagJets)*process.jetFlavourInfosCA15PFJets*process.printEventCA15PFJets ) -process.MessageLogger.destinations = cms.untracked.vstring('cout','cerr') -#process.MessageLogger.cout = cms.PSet( -# threshold = cms.untracked.string('ERROR') -#) +#process.MessageLogger.cout = dict( enable = True, threshold = 'ERROR') diff --git a/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py b/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py index 18c933c971117..7e5fbf43386e0 100644 --- a/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py +++ b/PhysicsTools/PatAlgos/test/corMETFromMiniAOD.py @@ -15,7 +15,6 @@ # Message Logger settings process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 1 # Set the process options -- Display summary at the end, enable unscheduled execution diff --git a/PhysicsTools/PatAlgos/test/private/patLayer1_fromAOD-minimal.cfg.py b/PhysicsTools/PatAlgos/test/private/patLayer1_fromAOD-minimal.cfg.py index 3c250eb4d4398..1bd572229398a 100755 --- a/PhysicsTools/PatAlgos/test/private/patLayer1_fromAOD-minimal.cfg.py +++ b/PhysicsTools/PatAlgos/test/private/patLayer1_fromAOD-minimal.cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATLayer0Summary') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATLayer0Summary = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatAlgos/test/private/testPATUserDataExternal.py b/PhysicsTools/PatAlgos/test/private/testPATUserDataExternal.py index 7092d81f70cf7..ff5859abd57bc 100644 --- a/PhysicsTools/PatAlgos/test/private/testPATUserDataExternal.py +++ b/PhysicsTools/PatAlgos/test/private/testPATUserDataExternal.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATLayer0Summary') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATLayer0Summary = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatExamples/test/analyzePatBJetTags_cfg.py b/PhysicsTools/PatExamples/test/analyzePatBJetTags_cfg.py index dd4a24d353b46..e2c2780ac6379 100644 --- a/PhysicsTools/PatExamples/test/analyzePatBJetTags_cfg.py +++ b/PhysicsTools/PatExamples/test/analyzePatBJetTags_cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatExamples/test/analyzePatBJetTracks_cfg.py b/PhysicsTools/PatExamples/test/analyzePatBJetTracks_cfg.py index 20e498b8e4333..2b541f99e0c0b 100644 --- a/PhysicsTools/PatExamples/test/analyzePatBJetTracks_cfg.py +++ b/PhysicsTools/PatExamples/test/analyzePatBJetTracks_cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatExamples/test/analyzePatBJetVertex_cfg.py b/PhysicsTools/PatExamples/test/analyzePatBJetVertex_cfg.py index e4c85785ccb75..b688b451af3aa 100644 --- a/PhysicsTools/PatExamples/test/analyzePatBJetVertex_cfg.py +++ b/PhysicsTools/PatExamples/test/analyzePatBJetVertex_cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatExamples/test/analyzePatElectron_cfg.py b/PhysicsTools/PatExamples/test/analyzePatElectron_cfg.py index 3fe1d9d94a6a3..a2ba78fe4dd5d 100644 --- a/PhysicsTools/PatExamples/test/analyzePatElectron_cfg.py +++ b/PhysicsTools/PatExamples/test/analyzePatElectron_cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatExamples/test/analyzePatTracks_cfg.py b/PhysicsTools/PatExamples/test/analyzePatTracks_cfg.py index bc119d62fb72a..33ce172ec1043 100644 --- a/PhysicsTools/PatExamples/test/analyzePatTracks_cfg.py +++ b/PhysicsTools/PatExamples/test/analyzePatTracks_cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/PatExamples/test/analyzePatVertex_cfg.py b/PhysicsTools/PatExamples/test/analyzePatVertex_cfg.py index 34e32a0444311..cae639d0d03e9 100644 --- a/PhysicsTools/PatExamples/test/analyzePatVertex_cfg.py +++ b/PhysicsTools/PatExamples/test/analyzePatVertex_cfg.py @@ -5,7 +5,7 @@ # initialize MessageLogger and output report process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('PATSummaryTables') + process.MessageLogger.cerr.INFO = cms.untracked.PSet( default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), PATSummaryTables = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/PhysicsTools/TagAndProbe/test/testTagProbeFitTreeAnalyzer_Zee.py b/PhysicsTools/TagAndProbe/test/testTagProbeFitTreeAnalyzer_Zee.py index 701e51f80d8ae..8bea886cc7f3b 100644 --- a/PhysicsTools/TagAndProbe/test/testTagProbeFitTreeAnalyzer_Zee.py +++ b/PhysicsTools/TagAndProbe/test/testTagProbeFitTreeAnalyzer_Zee.py @@ -5,7 +5,6 @@ process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) ) process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.destinations = ['cout', 'cerr'] process.MessageLogger.cerr.FwkReport.reportEvery = 1000 diff --git a/RecoHI/HiJetAlgos/test/testRegionalJetTracking_cfg.py b/RecoHI/HiJetAlgos/test/testRegionalJetTracking_cfg.py index 1bf8a272bf23c..78f04914507d4 100644 --- a/RecoHI/HiJetAlgos/test/testRegionalJetTracking_cfg.py +++ b/RecoHI/HiJetAlgos/test/testRegionalJetTracking_cfg.py @@ -33,7 +33,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = ['*'] -process.MessageLogger.categories = ['HeavyIonVertexing','heavyIonHLTVertexing','TauRegionalPixelSeedGenerator'] + process.MessageLogger.cerr = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( diff --git a/RecoHI/HiTracking/test/testTracking_cfg.py b/RecoHI/HiTracking/test/testTracking_cfg.py index bf25440965135..41c296f5549cd 100644 --- a/RecoHI/HiTracking/test/testTracking_cfg.py +++ b/RecoHI/HiTracking/test/testTracking_cfg.py @@ -35,7 +35,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") process.MessageLogger.debugModules = ['*'] -process.MessageLogger.categories = ['HeavyIonVertexing','heavyIonHLTVertexing','MinBiasTracking'] + process.MessageLogger.cerr = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), DEBUG = cms.untracked.PSet( diff --git a/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py b/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py index 0687c49e78f07..5f8409aee67e4 100644 --- a/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py +++ b/RecoLocalCalo/EcalRecProducers/test/testMultipleEcalRecoLocal_cfg.py @@ -121,7 +121,7 @@ ######################### #https://twiki.cern.ch/twiki/bin/viewauth/CMS/FastTimerService -process.MessageLogger.categories.append('FastReport') + process.MessageLogger.cerr.FastReport = cms.untracked.PSet( limit = cms.untracked.int32( 10000000 ) ) # remove any instance of the FastTimerService diff --git a/RecoLocalMuon/CSCRecHitD/test/run_on_raw.py b/RecoLocalMuon/CSCRecHitD/test/run_on_raw.py index ccd13c53a38db..20f17ed552f5d 100644 --- a/RecoLocalMuon/CSCRecHitD/test/run_on_raw.py +++ b/RecoLocalMuon/CSCRecHitD/test/run_on_raw.py @@ -51,12 +51,14 @@ # LogTrace output goes to cout; all other output to "junk.log" process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("CSCRecHit") -##process.MessageLogger.categories.append("CSCRecoConditions") + +## # module label is something like "muonCSCDigis"... process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCRecHitD/test/run_on_raw_72x.py b/RecoLocalMuon/CSCRecHitD/test/run_on_raw_72x.py index 25490ae4c65f1..5d256742b6fd2 100644 --- a/RecoLocalMuon/CSCRecHitD/test/run_on_raw_72x.py +++ b/RecoLocalMuon/CSCRecHitD/test/run_on_raw_72x.py @@ -33,12 +33,14 @@ # LogTrace output goes to cout; all other output to "junk.log" process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("CSCRecHit") + # module label is something like "muonCSCDigis"... process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCRecHitD/test/run_on_simdigi.py b/RecoLocalMuon/CSCRecHitD/test/run_on_simdigi.py index 72f209304c207..8cf4b725fcb02 100644 --- a/RecoLocalMuon/CSCRecHitD/test/run_on_simdigi.py +++ b/RecoLocalMuon/CSCRecHitD/test/run_on_simdigi.py @@ -50,16 +50,12 @@ # LogTrace output goes to cout; all other output to "junk.log" process.load("FWCore.MessageLogger.MessageLogger_cfi") -##process.MessageLogger.categories.append("CSCGeometry") -process.MessageLogger.categories.append("CSCRecHit") -##process.MessageLogger.categories.append("CSCRecHitDBuilder") -##process.MessageLogger.categories.append("CSCMake2DRecHit") -## process.MessageLogger.categories.append("CSCHitFromStripOnly") -## process.MessageLogger.categories.append("CSCRecoConditions") # module label is something like "muonCSCDigis"... process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/RecoLocalMuon/CSCRecHitD/test/test_bad_channels.py b/RecoLocalMuon/CSCRecHitD/test/test_bad_channels.py index 87be23aaeb308..ae8695bdddf74 100644 --- a/RecoLocalMuon/CSCRecHitD/test/test_bad_channels.py +++ b/RecoLocalMuon/CSCRecHitD/test/test_bad_channels.py @@ -17,9 +17,10 @@ process.load("Configuration.StandardSequences.EndOfProcess_cff") process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("CSCBadChannels") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_raw_700.py b/RecoLocalMuon/CSCSegment/test/run_on_raw_700.py index f6b6080c2daed..40f22aebabaac 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_raw_700.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_raw_700.py @@ -32,13 +32,15 @@ # LogTrace output goes to cout; all other output to "junk.log" process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("CSCRecHit") -process.MessageLogger.categories.append("CSCSegAlgoST") + + # module label is something like "muonCSCDigis"... process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_raw_720p3.py b/RecoLocalMuon/CSCSegment/test/run_on_raw_720p3.py index bf86d9d2bef26..7f9dbcb1e6969 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_raw_720p3.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_raw_720p3.py @@ -34,14 +34,13 @@ # LogTrace output goes to cout; all other output to "junk.log" process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("CSCRecHit") -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.categories.append("CSCSegAlgoST") # module label is something like "muonCSCDigis"... process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_raw_74x.py b/RecoLocalMuon/CSCSegment/test/run_on_raw_74x.py index c0f26ca2e69e8..8cb385e31b49a 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_raw_74x.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_raw_74x.py @@ -43,9 +43,10 @@ # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -57,14 +58,13 @@ ### LogTrace output goes to cout; all other output to "junk.log" #process.load("FWCore.MessageLogger.MessageLogger_cfi") -#process.MessageLogger.categories.append("CSCRecHit") -#process.MessageLogger.categories.append("CSCSegment") -#process.MessageLogger.categories.append("CSCSegAlgoST") ### module label is something like "muonCSCDigis"... #process.MessageLogger.debugModules = cms.untracked.vstring("*") -#process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +#process.MessageLogger.cerr.enable = False +#process.MessageLogger.files.junk = dict() #process.MessageLogger.cout = cms.untracked.PSet( +# enable = cms.untracked.bool(True), # threshold = cms.untracked.string("DEBUG"), # default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), # FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_raw_75x.py b/RecoLocalMuon/CSCSegment/test/run_on_raw_75x.py index c5eba595b6f37..e73344c5a7a11 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_raw_75x.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_raw_75x.py @@ -40,9 +40,10 @@ # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -54,9 +55,9 @@ ### LogTrace output goes to cout; all other output to "junk.log" #process.load("FWCore.MessageLogger.MessageLogger_cfi") -#process.MessageLogger.categories.append("CSCRecHit") -#process.MessageLogger.categories.append("CSCSegment") -#process.MessageLogger.categories.append("CSCSegAlgoST") +# +# +# ### module label is something like "muonCSCDigis"... #process.MessageLogger.debugModules = cms.untracked.vstring("*") diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi.py index ffb6724a1017d..6a06081eb1162 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi.py @@ -50,17 +50,15 @@ # LogTrace output goes to cout; all other output to "junk.log" process.load("FWCore.MessageLogger.MessageLogger_cfi") -##process.MessageLogger.categories.append("CSCGeometry") -process.MessageLogger.categories.append("CSCRecHit") -process.MessageLogger.categories.append("CSCSegAlgoST") -##process.MessageLogger.categories.append("CSCRecHitDBuilder") -##process.MessageLogger.categories.append("CSCMake2DRecHit") -## process.MessageLogger.categories.append("CSCHitFromStripOnly") -## process.MessageLogger.categories.append("CSCRecoConditions") +## + + # module label is something like "muonCSCDigis"... process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.files.junk = dict() +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_74x.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_74x.py index 0baaa96418477..244cf3452dec6 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_74x.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_74x.py @@ -78,9 +78,10 @@ process.cscSegments.algo_psets[3].algo_psets[1].useShowering = cms.bool(True) # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_75x.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_75x.py index 7a01b1de9ff65..e561d99c44fb6 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_75x.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_75x.py @@ -75,9 +75,10 @@ process.cscSegments.algo_psets[3].algo_psets[1].useShowering = cms.bool(True) # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cout.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_df.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_df.py index 7b798767cac17..71434e6b969a1 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_df.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_df.py @@ -71,9 +71,10 @@ # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_sk.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_sk.py index 20c8f853ae809..155eda84eaf09 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_sk.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_sk.py @@ -67,9 +67,10 @@ process.cscSegments.algo_type = cms.int32(1) # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_st.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_st.py index 944799a916908..18b7c8f38c65a 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_st.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_st.py @@ -80,9 +80,10 @@ process.cscSegments.algo_psets[3].algo_psets[1].useShowering = cms.bool(True) # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_tc.py b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_tc.py index 99b98adb4d12c..ffdbfe20f80aa 100644 --- a/RecoLocalMuon/CSCSegment/test/run_on_simdigi_tc.py +++ b/RecoLocalMuon/CSCSegment/test/run_on_simdigi_tc.py @@ -64,9 +64,10 @@ process.cscSegments.algo_type = cms.int32( 2 ) # --- Activate LogVerbatim IN CSCSegment -process.MessageLogger.categories.append("CSCSegment") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/GEMCSCSegment/test/runGEMCSCSegmentProducer_cfg.py b/RecoLocalMuon/GEMCSCSegment/test/runGEMCSCSegmentProducer_cfg.py index 429cb903be7be..d9552df8f8aba 100644 --- a/RecoLocalMuon/GEMCSCSegment/test/runGEMCSCSegmentProducer_cfg.py +++ b/RecoLocalMuon/GEMCSCSegment/test/runGEMCSCSegmentProducer_cfg.py @@ -55,13 +55,11 @@ ### that can be activated independentl ################################################################## process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("GEMCSCSegment") -process.MessageLogger.categories.append("GEMCSCSegmentBuilder") -# process.MessageLogger.categories.append("GEMCSCSegAlgoRR") -# process.MessageLogger.categories.append("GEMCSCSegFit") process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), @@ -73,8 +71,8 @@ ################################################################## ### TO ACTIVATE LogVerbatim IN GEMCSCSegment ### -------------------------------------------------------------- -# process.MessageLogger.categories.append("GEMCSCSegment") -# process.MessageLogger.categories.append("GEMCSCSegFit") +# +# # process.MessageLogger.destinations = cms.untracked.vstring("cout") # process.MessageLogger.cout = cms.untracked.PSet( # threshold = cms.untracked.string("INFO"), diff --git a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py index 87960555c5dcf..339c8d3fb838d 100644 --- a/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py +++ b/RecoLocalMuon/GEMRecHit/test/SingleMuPt100_cfi_GEM-SIM-DIGI_Extended2015MuonGEMDev.py @@ -69,12 +69,12 @@ ### Code/Configuration with thanks to Tim Cox ################################################################## process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("GEMGeometryBuilderFromDDD") -process.MessageLogger.categories.append("ME0GeometryBuilder") -process.MessageLogger.categories.append("RPCGeometryBuilder") + process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.files.junk = dict() +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/GEMSegment/test/runGEMSegmentProducer_cfg.py b/RecoLocalMuon/GEMSegment/test/runGEMSegmentProducer_cfg.py index a043d17252e78..1507abb30f3bb 100644 --- a/RecoLocalMuon/GEMSegment/test/runGEMSegmentProducer_cfg.py +++ b/RecoLocalMuon/GEMSegment/test/runGEMSegmentProducer_cfg.py @@ -46,13 +46,12 @@ ### that can be activated independentl ############################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("ME0Segment") -process.MessageLogger.categories.append("ME0SegmentBuilder") -# process.MessageLogger.categories.append("ME0SegAlgoMM") -# process.MessageLogger.categories.append("ME0SegFit") + process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLocalMuon/GEMSegment/test/runME0SegmentProducer_cfg.py b/RecoLocalMuon/GEMSegment/test/runME0SegmentProducer_cfg.py index e05029584489f..18e1f114486ed 100644 --- a/RecoLocalMuon/GEMSegment/test/runME0SegmentProducer_cfg.py +++ b/RecoLocalMuon/GEMSegment/test/runME0SegmentProducer_cfg.py @@ -46,13 +46,11 @@ ### that can be activated independentl ############################################################### process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append("ME0Segment") -process.MessageLogger.categories.append("ME0SegmentBuilder") -process.MessageLogger.categories.append("ME0SegAlgoMM") -process.MessageLogger.categories.append("ME0SegFit") process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py b/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py index 6c67175e20ca3..d100efe1882be 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/RunFromRAW_template.py @@ -11,8 +11,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) # -- Database configuration diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py index 01388a378082f..c76db4f1748ba 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_AlCaLumiPixels_LS.py @@ -11,8 +11,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) # -- Database configuration diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py index e469c58a3143e..3c6632a8e73b5 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_DataCert.py @@ -11,8 +11,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) # -- Database configuration diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py index 1050b807a004b..98250f05fd294 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_PixVertex_Event.py @@ -11,8 +11,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) # -- Database configuration diff --git a/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py b/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py index bdfecafed7be8..1fb246e63c53b 100644 --- a/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py +++ b/RecoLuminosity/LumiProducer/test/analysis/test/Run_template.py @@ -11,8 +11,8 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' process.MessageLogger.cerr.FwkReport.reportEvery = 1000 -process.MessageLogger.categories.append('HLTrigReport') -process.MessageLogger.categories.append('L1GtTrigReport') + + process.options = cms.untracked.PSet( wantSummary = cms.untracked.bool(True) ) # -- Database configuration diff --git a/RecoLuminosity/LumiProducer/test/testLumiProd_cfg.py b/RecoLuminosity/LumiProducer/test/testLumiProd_cfg.py index 4b16f0a180a07..517ad7a3b2bff 100755 --- a/RecoLuminosity/LumiProducer/test/testLumiProd_cfg.py +++ b/RecoLuminosity/LumiProducer/test/testLumiProd_cfg.py @@ -1,9 +1,8 @@ import FWCore.ParameterSet.Config as cms -process.MessageLogger.categories.extend(["GetManyWithoutRegistration","GetByLabelWithoutRegistration"]) + _messageSettings = cms.untracked.PSet( reportEvery = cms.untracked.int32(1), - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000000) ) process.MessageLogger.cerr.GetManyWithoutRegistration = _messageSettings diff --git a/RecoLuminosity/LumiProducer/test/testLumiProd_cfg_dummy.py b/RecoLuminosity/LumiProducer/test/testLumiProd_cfg_dummy.py index 6a67f1325828f..8e148e686ac92 100755 --- a/RecoLuminosity/LumiProducer/test/testLumiProd_cfg_dummy.py +++ b/RecoLuminosity/LumiProducer/test/testLumiProd_cfg_dummy.py @@ -7,10 +7,9 @@ # wantSummary = cms.untracked.bool(True), Rethrow = FWCore.Framework.test.cmsExceptionsFatalOption_cff.Rethrow ) -process.MessageLogger.categories.extend(["GetManyWithoutRegistration","GetByLabelWithoutRegistration"]) + _messageSettings = cms.untracked.PSet( reportEvery = cms.untracked.int32(1), - optionalPSet = cms.untracked.bool(True), limit = cms.untracked.int32(10000000) ) process.MessageLogger.cerr.GetManyWithoutRegistration = _messageSettings diff --git a/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py b/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py index 93207a940aa46..690b7f8f284cd 100644 --- a/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py +++ b/RecoLuminosity/LumiProducer/test/validation/fastsimSampleWithHLT_1E31_cfg.py @@ -111,13 +111,13 @@ process.schedule.append(process.outpath) process.load("FWCore/MessageService/MessageLogger_cfi") -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.categories.append('HLTrigReport') + + # Keep the logging output to a nice level # ##process.Timing = cms.Service("Timing") ##process.MessageLogger.destinations = cms.untracked.vstring("pyDetailedInfo.txt","cout") -##process.MessageLogger.categories.append("FamosManager") +## ##process.MessageLogger.cout = cms.untracked.PSet(threshold=cms.untracked.string("INFO"), ## default=cms.untracked.PSet(limit=cms.untracked.int32(0)), ## FamosManager=cms.untracked.PSet(limit=cms.untracked.int32(100000))) diff --git a/RecoMTD/DetLayers/test/mtd_cfg.py b/RecoMTD/DetLayers/test/mtd_cfg.py index e00dd3f23b0e0..1b2df8488f3e8 100644 --- a/RecoMTD/DetLayers/test/mtd_cfg.py +++ b/RecoMTD/DetLayers/test/mtd_cfg.py @@ -9,12 +9,9 @@ ) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.statistics.append("debugs") -process.MessageLogger.categories.append("MTDLayerDump") -process.MessageLogger.categories.append("MTDDetLayers") -process.MessageLogger.destinations.append('debugs') + process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.debugs = cms.untracked.PSet( +process.MessageLogger.files.debugs = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), INFO= cms.untracked.PSet( limit = cms.untracked.int32(0) @@ -28,6 +25,7 @@ MTDDetLayers = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), + enableStatistics = cms.untracked.bool(True) ) # Choose Tracker Geometry diff --git a/RecoParticleFlow/Configuration/test/IntegrationTestWithHLT_cfg.py b/RecoParticleFlow/Configuration/test/IntegrationTestWithHLT_cfg.py index da9f55016b3a8..d6c400ee3f65e 100644 --- a/RecoParticleFlow/Configuration/test/IntegrationTestWithHLT_cfg.py +++ b/RecoParticleFlow/Configuration/test/IntegrationTestWithHLT_cfg.py @@ -133,10 +133,10 @@ # Keep the logging output to a nice level # # process.Timing = cms.Service("Timing") process.load("FWCore/MessageService/MessageLogger_cfi") -process.MessageLogger.categories.append('L1GtTrigReport') -process.MessageLogger.categories.append('HLTrigReport') + + #process.MessageLogger.destinations = cms.untracked.vstring("pyDetailedInfo.txt","cout") -#process.MessageLogger.categories.append("FamosManager") +# #process.MessageLogger.cout = cms.untracked.PSet(threshold=cms.untracked.string("INFO"), # default=cms.untracked.PSet(limit=cms.untracked.int32(0)), # FamosManager=cms.untracked.PSet(limit=cms.untracked.int32(100000))) diff --git a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.py b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.py index 01d164c371229..f17b46d2b9184 100644 --- a/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.py +++ b/RecoTracker/TkDetLayers/test/TkDetLayersAnalyzer.py @@ -17,7 +17,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'DEBUG' -# process.MessageLogger.categories = ['TkDetLayers'] +# process.MessageLogger.debugModules = ['analyzer'] #process.MessageLogger.cerr.DEBUG = cms.untracked.PSet( # threshold = cms.untracked.string('DEBUG'), diff --git a/RecoVertex/BeamSpotProducer/test/readOnlineBeamSpotFromDB.py b/RecoVertex/BeamSpotProducer/test/readOnlineBeamSpotFromDB.py index d5b0db285c24e..8d8be4a01c62a 100644 --- a/RecoVertex/BeamSpotProducer/test/readOnlineBeamSpotFromDB.py +++ b/RecoVertex/BeamSpotProducer/test/readOnlineBeamSpotFromDB.py @@ -37,8 +37,8 @@ process.BeamSpotESProducer = cms.ESProducer("OfflineToTransientBeamSpotESProducer") -process.MessageLogger.destinations = cms.untracked.vstring('detailedInfo') -process.MessageLogger.detailedInfo = cms.untracked.PSet(threshold = cms.untracked.string('INFO')) +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.detailedInfo = cms.untracked.PSet(threshold = cms.untracked.string('INFO')) process.source = cms.Source("EmptySource") process.source.numberEventsInRun=cms.untracked.uint32(2) diff --git a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py index 75e3c88e78505..066ef71ebb2c2 100644 --- a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase1_cfg.py @@ -21,8 +21,8 @@ ) process.load("FWCore/MessageService/MessageLogger_cfi") -process.MessageLogger.destinations = cms.untracked.vstring("logfile") -process.MessageLogger.logfile = cms.untracked.PSet(threshold = cms.untracked.string('INFO')) +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.logfile = cms.untracked.PSet(threshold = cms.untracked.string('INFO')) process.Timing = cms.Service("Timing") diff --git a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py index 81950b63ccdb0..4a5a369520862 100644 --- a/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py +++ b/SLHCUpgradeSimulations/Geometry/test/writeFile_phase2_cfg.py @@ -18,8 +18,8 @@ ) process.load("FWCore/MessageService/MessageLogger_cfi") -process.MessageLogger.destinations = cms.untracked.vstring("logfile") -process.MessageLogger.logfile = cms.untracked.PSet(threshold = cms.untracked.string('INFO')) +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.logfile = cms.untracked.PSet(threshold = cms.untracked.string('INFO')) process.Timing = cms.Service("Timing") diff --git a/SimCalorimetry/EcalEBTrigPrimProducers/test/test_EBTrigPrim_cfg.py b/SimCalorimetry/EcalEBTrigPrimProducers/test/test_EBTrigPrim_cfg.py index c647ce57fd0f2..fd1acd9018025 100644 --- a/SimCalorimetry/EcalEBTrigPrimProducers/test/test_EBTrigPrim_cfg.py +++ b/SimCalorimetry/EcalEBTrigPrimProducers/test/test_EBTrigPrim_cfg.py @@ -5,7 +5,7 @@ process.load('Configuration.StandardSequences.Services_cff') process.load("FWCore.MessageService.MessageLogger_cfi") process.load('Configuration.EventContent.EventContent_cff') -process.MessageLogger.categories = cms.untracked.vstring('EBPhaseIITPStudies', 'FwkReport') + process.MessageLogger.cerr.FwkReport = cms.untracked.PSet( reportEvery = cms.untracked.int32(1) ) diff --git a/SimCalorimetry/EcalTestBeam/python/ecalTB2006H4_GenSimDigiReco_cfg.py b/SimCalorimetry/EcalTestBeam/python/ecalTB2006H4_GenSimDigiReco_cfg.py index 021ef65ced43b..d3bca5e7d82ff 100644 --- a/SimCalorimetry/EcalTestBeam/python/ecalTB2006H4_GenSimDigiReco_cfg.py +++ b/SimCalorimetry/EcalTestBeam/python/ecalTB2006H4_GenSimDigiReco_cfg.py @@ -259,28 +259,10 @@ # modify the default behavior of the MessageLogger -process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) -process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'BeamProfileVtxGenerator' - ) - #process.MessageLogger.debugModule = cms.untracked.vstring('g4SimHits','generatorSmeared') #Configuring the G4msg.log output -process.MessageLogger.G4msg = cms.untracked.PSet( +process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -304,6 +286,7 @@ ,G4cerr = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,BeamProfileVtxGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) +) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) diff --git a/SimCalorimetry/EcalTestBeam/python/gensimdigi_H4EEtest_cfg.py b/SimCalorimetry/EcalTestBeam/python/gensimdigi_H4EEtest_cfg.py index 6a8007d7a1d55..879d6150060c0 100644 --- a/SimCalorimetry/EcalTestBeam/python/gensimdigi_H4EEtest_cfg.py +++ b/SimCalorimetry/EcalTestBeam/python/gensimdigi_H4EEtest_cfg.py @@ -168,28 +168,10 @@ # modify the default behavior of the MessageLogger -process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) -process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'BeamProfileVtxGenerator' - ) - process.MessageLogger.debugModules = cms.untracked.vstring('g4SimHits','generatorSmeared') #Configuring the G4msg.log output -process.MessageLogger.G4msg = cms.untracked.PSet( +process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -213,6 +195,7 @@ ,G4cerr = cms.untracked.PSet(limit = cms.untracked.int32(99999)) ,BeamProfileVtxGenerator = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) +) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) @@ -221,7 +204,7 @@ ) #process.load("FWCore.MessageLogger.MessageLogger_cfi") -#process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +#process.MessageLogger.cout.enable = cms.untracked.bool(True) #process.MessageLogger.cout.threshold = cms.untracked.string('DEBUG') #process.MessageLogger.debugModules = cms.untracked.vstring('*') diff --git a/SimG4CMS/Calo/test/python/calostepAnalysis_cfg.py b/SimG4CMS/Calo/test/python/calostepAnalysis_cfg.py index 6e45ee3e77709..9822def90dcd4 100644 --- a/SimG4CMS/Calo/test/python/calostepAnalysis_cfg.py +++ b/SimG4CMS/Calo/test/python/calostepAnalysis_cfg.py @@ -11,8 +11,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HitStudy') + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/SimG4CMS/Calo/test/python/calostep_cfg.py b/SimG4CMS/Calo/test/python/calostep_cfg.py index 8879e79ae2945..f19312cd49347 100644 --- a/SimG4CMS/Calo/test/python/calostep_cfg.py +++ b/SimG4CMS/Calo/test/python/calostep_cfg.py @@ -18,11 +18,11 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('Step') - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10000) diff --git a/SimG4CMS/Calo/test/python/dd4hep_SingleMuon_Step1_cfg.py b/SimG4CMS/Calo/test/python/dd4hep_SingleMuon_Step1_cfg.py index 101cdf5be58ad..ae059181a6592 100644 --- a/SimG4CMS/Calo/test/python/dd4hep_SingleMuon_Step1_cfg.py +++ b/SimG4CMS/Calo/test/python/dd4hep_SingleMuon_Step1_cfg.py @@ -19,10 +19,6 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load('Configuration.Geometry.GeometryDD4hepExtended2021_cff') - -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalSimX') - process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100), output = cms.optional.untracked.allowed(cms.int32,cms.PSet) diff --git a/SimG4CMS/Calo/test/python/ddd_SingleMuon_Step1_cfg.py b/SimG4CMS/Calo/test/python/ddd_SingleMuon_Step1_cfg.py index c21ba8837074a..a103671be886e 100644 --- a/SimG4CMS/Calo/test/python/ddd_SingleMuon_Step1_cfg.py +++ b/SimG4CMS/Calo/test/python/ddd_SingleMuon_Step1_cfg.py @@ -19,9 +19,6 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load('Configuration.Geometry.GeometryExtended2021_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalSimX') - process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(100), output = cms.optional.untracked.allowed(cms.int32,cms.PSet) diff --git a/SimG4CMS/Calo/test/python/minbias_cfg.py b/SimG4CMS/Calo/test/python/minbias_cfg.py index 536a51f354fec..5e705fcf937df 100644 --- a/SimG4CMS/Calo/test/python/minbias_cfg.py +++ b/SimG4CMS/Calo/test/python/minbias_cfg.py @@ -21,8 +21,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/Calo/test/python/qcdpt3000_3500_cfg.py b/SimG4CMS/Calo/test/python/qcdpt3000_3500_cfg.py index b00b2ec6cc9d5..3d9d502b564ad 100644 --- a/SimG4CMS/Calo/test/python/qcdpt3000_3500_cfg.py +++ b/SimG4CMS/Calo/test/python/qcdpt3000_3500_cfg.py @@ -25,8 +25,8 @@ input = cms.untracked.int32(20) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.Timing = cms.Service("Timing") diff --git a/SimG4CMS/Calo/test/python/run2018Step1_cfg.py b/SimG4CMS/Calo/test/python/run2018Step1_cfg.py index 656237ff05039..de214c5b5654f 100644 --- a/SimG4CMS/Calo/test/python/run2018Step1_cfg.py +++ b/SimG4CMS/Calo/test/python/run2018Step1_cfg.py @@ -25,10 +25,10 @@ output = cms.optional.untracked.allowed(cms.int32,cms.PSet) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('ParticleGun') + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/Calo/test/python/runAPD_cfg.py b/SimG4CMS/Calo/test/python/runAPD_cfg.py index 61fc866879189..c19767cc6729e 100644 --- a/SimG4CMS/Calo/test/python/runAPD_cfg.py +++ b/SimG4CMS/Calo/test/python/runAPD_cfg.py @@ -16,11 +16,11 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run1_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('FlatThetaGun') - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('EcalSim') + + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runDetID_cfg.py b/SimG4CMS/Calo/test/python/runDetID_cfg.py index 33ff0eac87601..b384db214283e 100644 --- a/SimG4CMS/Calo/test/python/runDetID_cfg.py +++ b/SimG4CMS/Calo/test/python/runDetID_cfg.py @@ -15,8 +15,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runEcalGeom_cfg.py b/SimG4CMS/Calo/test/python/runEcalGeom_cfg.py index a8ed6449ba005..16cfbe5f0e751 100644 --- a/SimG4CMS/Calo/test/python/runEcalGeom_cfg.py +++ b/SimG4CMS/Calo/test/python/runEcalGeom_cfg.py @@ -21,9 +21,9 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('G4cout') + process.MessageLogger.EcalGeom = dict() + process.MessageLogger.EcalSim = dict() + process.MessageLogger.G4cout = dict() process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1), diff --git a/SimG4CMS/Calo/test/python/runEcalSimHitDump_cfg.py b/SimG4CMS/Calo/test/python/runEcalSimHitDump_cfg.py index f434b6043e3a2..2b6c457aea600 100644 --- a/SimG4CMS/Calo/test/python/runEcalSimHitDump_cfg.py +++ b/SimG4CMS/Calo/test/python/runEcalSimHitDump_cfg.py @@ -9,8 +9,8 @@ process.load('Configuration.Geometry.GeometryDD4hepExtended2021_cff') process.load('SimG4CMS.Calo.ecalSimHitDump_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HitStudy') + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4CMS/Calo/test/python/runEcalStudy_cfg.py b/SimG4CMS/Calo/test/python/runEcalStudy_cfg.py index ee8ee3a58434a..8e7f9db3cae38 100644 --- a/SimG4CMS/Calo/test/python/runEcalStudy_cfg.py +++ b/SimG4CMS/Calo/test/python/runEcalStudy_cfg.py @@ -15,8 +15,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -#if 'MessageLogger' in process.__dict__: -# process.MessageLogger.categories.append('HitStudy') +# +# process.load("IOMC.RandomEngine.IOMC_cff") diff --git a/SimG4CMS/Calo/test/python/runEta13_cfg.py b/SimG4CMS/Calo/test/python/runEta13_cfg.py index ac84447002c32..fc1424ca61a02 100644 --- a/SimG4CMS/Calo/test/python/runEta13_cfg.py +++ b/SimG4CMS/Calo/test/python/runEta13_cfg.py @@ -13,8 +13,8 @@ process.load('Configuration.StandardSequences.Generator_cff') process.load('Configuration.StandardSequences.SimIdeal_cff') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runEta2_cfg.py b/SimG4CMS/Calo/test/python/runEta2_cfg.py index 0166121758189..a752fc9f8fe9c 100644 --- a/SimG4CMS/Calo/test/python/runEta2_cfg.py +++ b/SimG4CMS/Calo/test/python/runEta2_cfg.py @@ -17,8 +17,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run1_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runEta7_cfg.py b/SimG4CMS/Calo/test/python/runEta7_cfg.py index b79e857f9832d..143f8e7a3869a 100644 --- a/SimG4CMS/Calo/test/python/runEta7_cfg.py +++ b/SimG4CMS/Calo/test/python/runEta7_cfg.py @@ -17,8 +17,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run1_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runHFNose_cfg.py b/SimG4CMS/Calo/test/python/runHFNose_cfg.py index 6aaa2d663b357..a778a0d81b694 100644 --- a/SimG4CMS/Calo/test/python/runHFNose_cfg.py +++ b/SimG4CMS/Calo/test/python/runHFNose_cfg.py @@ -21,10 +21,10 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HFNSim') - process.MessageLogger.categories.append('HGCalValidation') + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runHGC3_cfg.py b/SimG4CMS/Calo/test/python/runHGC3_cfg.py index 2231a67872f34..d9cf236abcb2d 100644 --- a/SimG4CMS/Calo/test/python/runHGC3_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC3_cfg.py @@ -16,9 +16,9 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic_T21', '') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HGCSim') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runHGC4_cfg.py b/SimG4CMS/Calo/test/python/runHGC4_cfg.py index dd2d88a4bfb97..e8c7273c31600 100644 --- a/SimG4CMS/Calo/test/python/runHGC4_cfg.py +++ b/SimG4CMS/Calo/test/python/runHGC4_cfg.py @@ -14,11 +14,11 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HGCSim') - process.MessageLogger.categories.append('CaloSim') -# process.MessageLogger.categories.append('SimG4CoreGeometry') + + + + +# process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runHcalGeom_cfg.py b/SimG4CMS/Calo/test/python/runHcalGeom_cfg.py index 06c7958821793..9236e5f740538 100644 --- a/SimG4CMS/Calo/test/python/runHcalGeom_cfg.py +++ b/SimG4CMS/Calo/test/python/runHcalGeom_cfg.py @@ -20,9 +20,9 @@ process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1), diff --git a/SimG4CMS/Calo/test/python/runMakeGDML_cfg.py b/SimG4CMS/Calo/test/python/runMakeGDML_cfg.py index ddf68996e095f..09c037eecadf2 100644 --- a/SimG4CMS/Calo/test/python/runMakeGDML_cfg.py +++ b/SimG4CMS/Calo/test/python/runMakeGDML_cfg.py @@ -16,9 +16,9 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:run1_mc', '') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('G4cerr') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runMuon_cfg.py b/SimG4CMS/Calo/test/python/runMuon_cfg.py index 5c41079d8a512..5aaffcea6d6d2 100644 --- a/SimG4CMS/Calo/test/python/runMuon_cfg.py +++ b/SimG4CMS/Calo/test/python/runMuon_cfg.py @@ -18,9 +18,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('HitStudy') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runScale_cfg.py b/SimG4CMS/Calo/test/python/runScale_cfg.py index de67c444627dd..e4acc3009df0d 100644 --- a/SimG4CMS/Calo/test/python/runScale_cfg.py +++ b/SimG4CMS/Calo/test/python/runScale_cfg.py @@ -18,9 +18,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run1_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('HitStudy') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/runWithAPDTest_cfg.py b/SimG4CMS/Calo/test/python/runWithAPDTest_cfg.py index 6ea4dc180cf84..854643ceb14cd 100644 --- a/SimG4CMS/Calo/test/python/runWithAPDTest_cfg.py +++ b/SimG4CMS/Calo/test/python/runWithAPDTest_cfg.py @@ -20,9 +20,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run1_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('HitParentTest') + + + process.load("IOMC.RandomEngine.IOMC_cff") diff --git a/SimG4CMS/Calo/test/python/runWithGun_cfg.py b/SimG4CMS/Calo/test/python/runWithGun_cfg.py index 3196e5342cbd0..8d04c06b4adbe 100644 --- a/SimG4CMS/Calo/test/python/runWithGun_cfg.py +++ b/SimG4CMS/Calo/test/python/runWithGun_cfg.py @@ -17,9 +17,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['run2_mc'] -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('EcalSim') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Calo/test/python/ttbar_cfg.py b/SimG4CMS/Calo/test/python/ttbar_cfg.py index 142b4dad400fa..542b2d5d29f23 100644 --- a/SimG4CMS/Calo/test/python/ttbar_cfg.py +++ b/SimG4CMS/Calo/test/python/ttbar_cfg.py @@ -25,8 +25,8 @@ input = cms.untracked.int32(50) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.Timing = cms.Service("Timing") diff --git a/SimG4CMS/Calo/test/python/zee_cfg.py b/SimG4CMS/Calo/test/python/zee_cfg.py index 35217633d7886..90997f299745b 100644 --- a/SimG4CMS/Calo/test/python/zee_cfg.py +++ b/SimG4CMS/Calo/test/python/zee_cfg.py @@ -24,8 +24,8 @@ input = cms.untracked.int32(50) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') + + process.Timing = cms.Service("Timing") diff --git a/SimG4CMS/CherenkovAnalysis/test/runSingleDREAM_cfg.py b/SimG4CMS/CherenkovAnalysis/test/runSingleDREAM_cfg.py index 9dbc76503062e..6f24b38884646 100644 --- a/SimG4CMS/CherenkovAnalysis/test/runSingleDREAM_cfg.py +++ b/SimG4CMS/CherenkovAnalysis/test/runSingleDREAM_cfg.py @@ -20,9 +20,9 @@ process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('CherenkovAnalysis') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py b/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py index 3976b889c5e43..52bc46bb92680 100644 --- a/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py +++ b/SimG4CMS/CherenkovAnalysis/test/testMuon_cfg.py @@ -51,9 +51,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('CherenkovAnalysis') + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/Forward/python/test/runZdc_cfg.py b/SimG4CMS/Forward/python/test/runZdc_cfg.py index 28f90b7e36222..a93b04788c5bf 100644 --- a/SimG4CMS/Forward/python/test/runZdc_cfg.py +++ b/SimG4CMS/Forward/python/test/runZdc_cfg.py @@ -90,29 +90,10 @@ def customise(process): #Tweak Message logger to dump G4cout and G4cerr messages in G4msg.log #print process.MessageLogger.__dict__ - process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'CaloSim' - ,'ForwardSim' - ) - process.MessageLogger.debugModules=cms.untracked.vstring('g4SimHits') #Configuring the G4msg.log output - process.MessageLogger.G4msg = cms.untracked.PSet( + process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -137,6 +118,7 @@ def customise(process): ,CaloSim = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,ForwardSim = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) +) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) diff --git a/SimG4CMS/Forward/test/python/runTotemT22021_cfg.py b/SimG4CMS/Forward/test/python/runTotemT22021_cfg.py index 2aa3b220c0211..2aca99441f01a 100644 --- a/SimG4CMS/Forward/test/python/runTotemT22021_cfg.py +++ b/SimG4CMS/Forward/test/python/runTotemT22021_cfg.py @@ -13,11 +13,11 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ForwardGeom') - process.MessageLogger.categories.append('ForwardSim') - process.MessageLogger.categories.append('CaloSim') -# process.MessageLogger.categories.append('SimG4CoreGeometry') + + + + +# process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py index 0dfa438b7dc9f..09a0864b70801 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN170_cfg.py @@ -26,11 +26,11 @@ input = cms.untracked.int32(10) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCSim') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTB06BeamSD') - process.MessageLogger.categories.append('ValidHGCal') + + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py index 2bbaf8208f328..235fd78e87463 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1_cfg.py @@ -26,12 +26,12 @@ input = cms.untracked.int32(10) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('SimG4CoreGeometry') - process.MessageLogger.categories.append('HGCSim') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTB06BeamSD') + + + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py index c3f17fd168b8e..516ca5d42d166 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct1el100_cfg.py @@ -26,10 +26,10 @@ input = cms.untracked.int32(10) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('BeamMomentumGun') - process.MessageLogger.categories.append('HGCSim') -# process.MessageLogger.categories.append('HcalSim') + + + +# # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py index 167c53dc7fc67..deac4a41d3223 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct2_cfg.py @@ -26,12 +26,12 @@ input = cms.untracked.int32(10) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('SimG4CoreGeometry') - process.MessageLogger.categories.append('HGCSim') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTB06BeamSD') + + + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py index ccfcc0f3bfe92..940da6db4bed4 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181Oct3_cfg.py @@ -26,12 +26,12 @@ input = cms.untracked.int32(10) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('SimG4CoreGeometry') - process.MessageLogger.categories.append('HGCSim') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTB06BeamSD') + + + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181_cfg.py index 025fb0a2a6624..f41d693fc8106 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBCERN181_cfg.py @@ -24,10 +24,10 @@ input = cms.untracked.int32(10) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCSim') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTB06BeamSD') + + + + # Input source process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py b/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py index a65c53a50b95a..7ba813083d330 100644 --- a/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/HGCalTBGenSimCERNMB_cfg.py @@ -34,9 +34,9 @@ input = cms.untracked.int32(1000) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HGCSim') + + + # Input source diff --git a/SimG4CMS/HGCalTestBeam/test/dumpTBGeometry_cfg.py b/SimG4CMS/HGCalTestBeam/test/dumpTBGeometry_cfg.py index 0ad34f5b08ce5..da344a9309139 100644 --- a/SimG4CMS/HGCalTestBeam/test/dumpTBGeometry_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/dumpTBGeometry_cfg.py @@ -4,10 +4,10 @@ process.load("SimG4CMS.HGCalTestBeam.HGCalTB181Oct3XML_cfi") process.load('FWCore.MessageService.MessageLogger_cfi') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('HGCalGeom') + + + + process.source = cms.Source("EmptySource") diff --git a/SimG4CMS/HGCalTestBeam/test/runTBAnalCERN181Oct1_cfg.py b/SimG4CMS/HGCalTestBeam/test/runTBAnalCERN181Oct1_cfg.py index e8a7f60549358..1ad650111e243 100644 --- a/SimG4CMS/HGCalTestBeam/test/runTBAnalCERN181Oct1_cfg.py +++ b/SimG4CMS/HGCalTestBeam/test/runTBAnalCERN181Oct1_cfg.py @@ -21,9 +21,9 @@ input = cms.untracked.int32(-1) ) -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HGCSim') + + + # Input source process.source = cms.Source("PoolSource", diff --git a/SimG4CMS/HcalTestBeam/test/python/anal_tb06_noEcal_cfg.py b/SimG4CMS/HcalTestBeam/test/python/anal_tb06_noEcal_cfg.py index 27e26c3ffc7c7..4e749c62b8ab8 100644 --- a/SimG4CMS/HcalTestBeam/test/python/anal_tb06_noEcal_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/anal_tb06_noEcal_cfg.py @@ -11,7 +11,8 @@ fileName = cms.string('tb_pi_50gevNOECAL.root') ) -process.MessageLogger.destinations = cms.untracked.vstring("tb_pi_50gevNOECAL.txt") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.tb_pi_50gevNOECAL = dict(extension="txt") process.common_beam_direction_parameters.MinE = cms.double(50.0) process.common_beam_direction_parameters.MaxE = cms.double(50.0) diff --git a/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py index 4e93a7c698132..f5fc834a970eb 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2004_cfg.py @@ -16,15 +16,15 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('EcalGeom') - process.MessageLogger.categories.append('HcalSim') - process.MessageLogger.categories.append('HcalTBSim') - process.MessageLogger.categories.append('EcalSim') - process.MessageLogger.categories.append('CaloSim') - process.MessageLogger.categories.append('SimHCalData') - process.MessageLogger.categories.append('VertexGenerator') + + + + + + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py index 47667db48761a..9ed0dbc4f1d29 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2006_33_cfg.py @@ -14,9 +14,9 @@ process.load('SimG4Core.Application.g4SimHits_cfi') process.load('IOMC.RandomEngine.IOMC_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.TFileService = cms.Service("TFileService", fileName = cms.string('hcaltb06_33.root') diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py index a05480699ddc5..49f71911ae18e 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2006_37_cfg.py @@ -14,9 +14,9 @@ process.load('SimG4Core.Application.g4SimHits_cfi') process.load('IOMC.RandomEngine.IOMC_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.TFileService = cms.Service("TFileService", fileName = cms.string('hcaltb06_37.root') diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py index 5b288fa661782..ff16f4d03ac5b 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2006_77_cfg.py @@ -14,9 +14,9 @@ process.load('SimG4Core.Application.g4SimHits_cfi') process.load('IOMC.RandomEngine.IOMC_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.TFileService = cms.Service("TFileService", fileName = cms.string('hcaltb06_77.root') diff --git a/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py index 7b84e23d954da..b4027e0ac48e8 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2006_cfg.py @@ -14,9 +14,9 @@ process.load('SimG4Core.Application.g4SimHits_cfi') process.load('IOMC.RandomEngine.IOMC_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.TFileService = cms.Service("TFileService", fileName = cms.string('hcaltb06.root') diff --git a/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py index 9cf62d4aaaf9a..821cdf24d99a6 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2007_cfg.py @@ -14,9 +14,9 @@ process.load('SimG4Core.Application.g4SimHits_cfi') process.load('IOMC.RandomEngine.IOMC_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.TFileService = cms.Service("TFileService", fileName = cms.string('hcaltb07.root') diff --git a/SimG4CMS/HcalTestBeam/test/python/run2010_cfg.py b/SimG4CMS/HcalTestBeam/test/python/run2010_cfg.py index c0116a6a34da6..0545b705e4e69 100644 --- a/SimG4CMS/HcalTestBeam/test/python/run2010_cfg.py +++ b/SimG4CMS/HcalTestBeam/test/python/run2010_cfg.py @@ -14,9 +14,9 @@ process.load('SimG4Core.Application.g4SimHits_cfi') process.load('IOMC.RandomEngine.IOMC_cff') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') - process.MessageLogger.categories.append('HcalSim') + + + process.TFileService = cms.Service("TFileService", fileName = cms.string('ehcaltb10.root') diff --git a/SimG4CMS/Muon/test/runMuonSimHitDump_cfg.py b/SimG4CMS/Muon/test/runMuonSimHitDump_cfg.py index d1f4560691fec..761a02706c594 100644 --- a/SimG4CMS/Muon/test/runMuonSimHitDump_cfg.py +++ b/SimG4CMS/Muon/test/runMuonSimHitDump_cfg.py @@ -9,8 +9,8 @@ process.load('Configuration.Geometry.GeometryDD4hepExtended2021_cff') process.load('SimG4CMS.Muon.muonSimHitDump_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HitStudy') + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4CMS/Muon/test/runMuon_cfg.py b/SimG4CMS/Muon/test/runMuon_cfg.py index 1a0e38cf67c0c..269adac6e1dd8 100644 --- a/SimG4CMS/Muon/test/runMuon_cfg.py +++ b/SimG4CMS/Muon/test/runMuon_cfg.py @@ -22,10 +22,10 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2021_realistic', '') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('MuonSim') - process.MessageLogger.categories.append('MuonGeom') + + + + process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/SimG4Core/Application/test/GeometryProducer_cfg.py b/SimG4Core/Application/test/GeometryProducer_cfg.py index 0b833b4cafc3a..2ca33bf4f0f8b 100644 --- a/SimG4Core/Application/test/GeometryProducer_cfg.py +++ b/SimG4Core/Application/test/GeometryProducer_cfg.py @@ -12,7 +12,8 @@ ) process.source = cms.Source("EmptySource") -process.MessageLogger.destinations = cms.untracked.vstring("geomprod.txt") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.geomprod = dict(extension="txt") common_heavy_suppression = cms.PSet( NeutronThreshold = cms.double(30.0), diff --git a/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step1_cfg.py b/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step1_cfg.py index 21f11c17da75f..adc77c03b79ac 100644 --- a/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step1_cfg.py +++ b/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step1_cfg.py @@ -20,15 +20,15 @@ process.load('Configuration.Geometry.GeometryDD4hepExtended2021_cff') # there w -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalGeom') -# process.MessageLogger.categories.append('MuonSim') -# process.MessageLogger.categories.append('CaloSim') -# process.MessageLogger.categories.append('EcalSim') -# process.MessageLogger.categories.append('HcalSim') -# process.MessageLogger.categories.append('SimG4CoreApplication') -# process.MessageLogger.categories.append("TrackerGeometryBuilder"); -# process.MessageLogger.categories.append("TrackerSimInfoNumbering"); + + +# +# +# +# +# +# +# process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step2_cfg.py b/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step2_cfg.py index 10057df88c977..88e4600cac6b5 100644 --- a/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step2_cfg.py +++ b/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step2_cfg.py @@ -19,10 +19,10 @@ process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -#if hasattr(process,'MessageLogger'): -# process.MessageLogger.categories.append('EcalGeom') -# process.MessageLogger.categories.append('GEMGeometry') -# process.MessageLogger.categories.append('CaloGeometryBuilder') +# +# +# +# process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step3_cfg.py b/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step3_cfg.py index 93de45c447dfe..ea8b7f64c799f 100644 --- a/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step3_cfg.py +++ b/SimG4Core/Configuration/test/dd4hep_ZMM_Run3_Step3_cfg.py @@ -24,7 +24,7 @@ process.load('DQMOffline.Configuration.DQMOfflineMC_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.MessageLogger.categories.append("TrackerGeometryBuilder"); + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step1_cfg.py b/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step1_cfg.py index 3cd66fc8dd629..83a44b1d7435f 100644 --- a/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step1_cfg.py +++ b/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step1_cfg.py @@ -19,11 +19,11 @@ process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') process.load('Configuration.Geometry.GeometryExtended2021_cff') # there w -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('EcalGeom') -# process.MessageLogger.categories.append('Geometry') -# process.MessageLogger.categories.append("TrackerGeometryBuilder"); -# process.MessageLogger.categories.append("TrackerSimInfoNumbering"); + + +# +# +# diff --git a/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step2_cfg.py b/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step2_cfg.py index 3cfb0e3a015a8..b3e033c42b3c7 100644 --- a/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step2_cfg.py +++ b/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step2_cfg.py @@ -19,9 +19,9 @@ process.load('Configuration.StandardSequences.EndOfProcess_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -#if hasattr(process,'MessageLogger'): -# process.MessageLogger.categories.append('GEMGeometry') -# process.MessageLogger.categories.append('CaloGeometryBuilder') +# +# +# process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step3_cfg.py b/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step3_cfg.py index 7ad5f113682a8..4765d6e86401b 100644 --- a/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step3_cfg.py +++ b/SimG4Core/Configuration/test/ddd_ZMM_Run3_Step3_cfg.py @@ -24,7 +24,7 @@ process.load('DQMOffline.Configuration.DQMOfflineMC_cff') process.load('Configuration.StandardSequences.FrontierConditions_GlobalTag_cff') -process.MessageLogger.categories.append("TrackerGeometryBuilder"); + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10), diff --git a/SimG4Core/HelpfulWatchers/python/G4StepStatistics.py b/SimG4Core/HelpfulWatchers/python/G4StepStatistics.py index 21e139755299f..68474c0149f89 100644 --- a/SimG4Core/HelpfulWatchers/python/G4StepStatistics.py +++ b/SimG4Core/HelpfulWatchers/python/G4StepStatistics.py @@ -9,24 +9,8 @@ def customise(process): #Tweak Message logger to dump G4cout and G4cerr messages in G4msg.log #print process.MessageLogger.__dict__ - process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ) #Configuring the G4msg.log output - process.MessageLogger.G4msg = cms.untracked.PSet( + process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -48,6 +32,7 @@ def customise(process): ,G4cout = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,G4cerr = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) +) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) diff --git a/SimG4Core/PhysicsLists/test/minbias_cfg.py b/SimG4Core/PhysicsLists/test/minbias_cfg.py index 28ecaf16fa94b..7d1345585ac93 100644 --- a/SimG4Core/PhysicsLists/test/minbias_cfg.py +++ b/SimG4Core/PhysicsLists/test/minbias_cfg.py @@ -22,8 +22,8 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase1_2021_realistic', '') -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('PhysicsList') + + process.source = cms.Source("EmptySource") diff --git a/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py index dba26c9c77c82..31af188f60ad0 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4DumpGeometry_cfg.py @@ -11,7 +11,8 @@ from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import * process = checkOverlap(process) -process.MessageLogger.destinations = cms.untracked.vstring("Ecal2017.info") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.Ecal2017 = dict(extension ="info") # enable Geant4 overlap check process.g4SimHits.CheckGeometry = cms.bool(True) diff --git a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck_cfg.py b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck_cfg.py index 1ea65e2594fe2..e870b7b4259ce 100644 --- a/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/g4OverlapCheck_cfg.py @@ -10,8 +10,8 @@ #process.load('Configuration.Geometry.GeometryExtended2026D45_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HCalGeom') + + from SimG4Core.PrintGeomInfo.g4TestGeometry_cfi import * process = checkOverlap(process) diff --git a/SimG4Core/PrintGeomInfo/test/python/runDD4HEP_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDD4HEP_cfg.py index 37df56783bfc2..2b1bed816c3eb 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDD4HEP_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDD4HEP_cfg.py @@ -16,9 +16,9 @@ process = printGeomInfo(process) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') + + + process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Geometry/CMSCommonData/data/dd4hep/cmsExtendedGeometry2021.xml'), diff --git a/SimG4Core/PrintGeomInfo/test/python/runDDD_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runDDD_cfg.py index d5ce96273638a..84c3b4462010f 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runDDD_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runDDD_cfg.py @@ -14,9 +14,9 @@ process = printGeomInfo(process) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('G4cerr') - process.MessageLogger.categories.append('G4cout') + + + process.g4SimHits.Watchers.Names = cms.untracked.vstring('HGCalEE') #process.g4SimHits.Watchers.Names = cms.untracked.vstring('Internal_CSC_for_TotemT1_Plane_0_0_5', 'Internal_CSC_for_TotemT1_Plane_1_0_5','Internal_CSC_for_TotemT1_Plane_2_0_5','Internal_CSC_for_TotemT1_Plane_3_0_5','Internal_CSC_for_TotemT1_Plane_4_0_5','Internal_CSC_for_TotemT1_Plane_0_5_5','Internal_CSC_for_TotemT1_Plane_1_5_5','Internal_CSC_for_TotemT1_Plane_2_5_5','Internal_CSC_for_TotemT1_Plane_3_5_5','Internal_CSC_for_TotemT1_Plane_4_5_5','TotemT2gem_driftspace7r') diff --git a/SimG4Core/PrintGeomInfo/test/python/runSens_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSens_cfg.py index 63d86ca961e95..078dfe5bb0c05 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runSens_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runSens_cfg.py @@ -10,7 +10,8 @@ #process.load("Geometry.EcalCommonData.ecalSimulationParameters_cff") #process.load('Geometry.HcalCommonData.hcalDDDSimConstants_cff') -process.MessageLogger.destinations = cms.untracked.vstring("SensDet.txt") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.SensDet = dict(extension="txt") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) diff --git a/SimG4Core/PrintGeomInfo/test/python/runSummary_cfg.py b/SimG4Core/PrintGeomInfo/test/python/runSummary_cfg.py index 70fddd162101f..29e5dea4f4d85 100644 --- a/SimG4Core/PrintGeomInfo/test/python/runSummary_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/runSummary_cfg.py @@ -13,9 +13,9 @@ process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('G4cout') - process.MessageLogger.categories.append('G4cerr') + + + from SimG4Core.PrintGeomInfo.g4PrintGeomSummary_cfi import * diff --git a/SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py b/SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py index 44b95d264c5fa..8914396c92c3b 100644 --- a/SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py +++ b/SimG4Core/PrintGeomInfo/test/python/run_MaterialBudgeInfo_cfg.py @@ -8,7 +8,8 @@ process.load("Geometry.EcalCommonData.ecalSimulationParameters_cff") process.load('Geometry.HcalCommonData.hcalDDDSimConstants_cff') -process.MessageLogger.destinations = cms.untracked.vstring("MatBudget.txt") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.MatBudget = dict(extension = "txt") process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(1) diff --git a/SimGeneral/HepPDTESSource/test/ParticleCheck.py b/SimGeneral/HepPDTESSource/test/ParticleCheck.py index ef5711cd03d94..0470ce54360a1 100644 --- a/SimGeneral/HepPDTESSource/test/ParticleCheck.py +++ b/SimGeneral/HepPDTESSource/test/ParticleCheck.py @@ -9,22 +9,8 @@ edm::LogInfo("SimG4CoreApplication") << "Output of G4ParticleTable DumpTable:"; G4ParticleTable::GetParticleTable()->DumpTable("ALL"); 2-Edit the Validation/Performance/python/TimeMemoryG4Info.py customise fragment (or you could create your own): - a-Add SimG4CoreApplication to the message logger categories: - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'SimG4CoreApplication' - ) - b-Configure the output (in this case to the file G4msg.log) to include SimG4CoreApplication: - process.MessageLogger.G4msg = cms.untracked.PSet( + a-Configure the output (in this case to the file G4msg.log) to include SimG4CoreApplication: + process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -47,6 +33,7 @@ ,G4cerr = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,SimG4CoreApplication = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) + ) 3-Run any cmsDriver.py commands that entail simulation, e.g.(in CMSSW_3_1_0_pre4): cmsDriver.py MinBias.cfi -n 1 --step GEN,SIM --customise=Validation/Performance/TimeMemoryG4Info.py --eventcontent FEVTDEBUG --conditions FrontierConditions_GlobalTag,IDEAL_30X::All > & ! MinBias.log & The resulting file G4msg.log contains the dump of the G4 Particle Table. We run on it, extract the information we are interested in and we store it in 2 dictionaries: diff --git a/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py b/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py index 306019f1fb0fd..188e83312d460 100644 --- a/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py +++ b/SimMuon/CSCDigitizer/test/CSCDigiDump_cfg.py @@ -38,13 +38,14 @@ process.load('FWCore.MessageService.MessageLogger_cfi') # Activate LogVerbatim output in CSCDigitizer -##process.MessageLogger.categories.append("CSCDigitizer") +## # Activate LogVerbatim output in CSC Digis and CSCDigiDump -process.MessageLogger.categories.append("CSCDigi") -process.MessageLogger.destinations = cms.untracked.vstring("cout") + +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py b/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py index 170c84289a0c5..e1e1a091d0ce3 100644 --- a/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py +++ b/SimMuon/CSCDigitizer/test/CSCDigitizerTest_cfg.py @@ -42,13 +42,14 @@ process.load('FWCore.MessageService.MessageLogger_cfi') # Activate LogVerbatim output in CSCDigitizer -process.MessageLogger.categories.append("CSCDigitizer") + # Activate LogVerbatim output in CSC Digis and CSCDigiDump -##process.MessageLogger.categories.append("CSCDigi") +## -process.MessageLogger.destinations = cms.untracked.vstring("cout") +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("INFO"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/SimMuon/MCTruth/test/testAssociatorRecoMuon_cfg.py b/SimMuon/MCTruth/test/testAssociatorRecoMuon_cfg.py index eeb3143eb400c..0d7600c80bd87 100644 --- a/SimMuon/MCTruth/test/testAssociatorRecoMuon_cfg.py +++ b/SimMuon/MCTruth/test/testAssociatorRecoMuon_cfg.py @@ -21,7 +21,7 @@ # MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories = cms.untracked.vstring('testAssociatorRecoMuon', 'muonAssociatorByHitsHelper') + process.MessageLogger.cout = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), @@ -29,7 +29,7 @@ default = cms.untracked.PSet(limit = cms.untracked.int32(0)), testAssociatorRecoMuon = cms.untracked.PSet(limit = cms.untracked.int32(10000000)) ) -process.MessageLogger.cerr = cms.untracked.PSet(placeholder = cms.untracked.bool(True)) +process.MessageLogger.cerr = cms.untracked.PSet(enable = cms.untracked.bool(False)) # Mixing Module process.load("SimGeneral.MixingModule.mixNoPU_cfi") diff --git a/SimMuon/MCTruth/test/testCosmics42X_cfg.py b/SimMuon/MCTruth/test/testCosmics42X_cfg.py index b2ce06255c0c5..0a2b616b02865 100644 --- a/SimMuon/MCTruth/test/testCosmics42X_cfg.py +++ b/SimMuon/MCTruth/test/testCosmics42X_cfg.py @@ -21,11 +21,6 @@ process.load("FWCore.MessageService.MessageLogger_cfi") #process.MessageLogger.debugModules = cms.untracked.vstring("testanalyzer","muonAssociatorByHits","process.muonTrackProducer") - -process.MessageLogger.categories = cms.untracked.vstring('testReader', 'MuonAssociatorEDProducer', 'MuonTrackProducer', - 'MuonAssociatorByHits', 'DTHitAssociator', 'RPCHitAssociator', 'MuonTruth', - 'MixingModule', 'FwkJob', 'FwkReport', 'FwkSummary', 'Root_NoDictionary') - process.MessageLogger.cerr = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True), @@ -55,6 +50,7 @@ ) process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), noTimeStamps = cms.untracked.bool(True), # threshold = cms.untracked.string('DEBUG'), @@ -103,7 +99,7 @@ ) ) -#process.MessageLogger.statistics = cms.untracked.vstring('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) #process.Tracer = cms.Service("Tracer") diff --git a/SimMuon/MCTruth/test/testMuonAssociatorEDProducer_cfg.py b/SimMuon/MCTruth/test/testMuonAssociatorEDProducer_cfg.py index 5872518a5fd91..6ce20007fdfb4 100644 --- a/SimMuon/MCTruth/test/testMuonAssociatorEDProducer_cfg.py +++ b/SimMuon/MCTruth/test/testMuonAssociatorEDProducer_cfg.py @@ -26,10 +26,6 @@ #process.MessageLogger.debugModules = cms.untracked.vstring("testanalyzer","muonAssociatorByHits","process.muonTrackProducer") -process.MessageLogger.categories = cms.untracked.vstring('testReader', 'MuonAssociatorEDProducer', 'MuonTrackProducer', - 'MuonAssociatorByHits', 'DTHitAssociator', 'RPCHitAssociator', 'MuonTruth', - 'FwkJob', 'FwkReport', 'FwkSummary', 'Root_NoDictionary') - process.MessageLogger.cerr = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True), @@ -59,6 +55,7 @@ ) process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), noTimeStamps = cms.untracked.bool(True), # threshold = cms.untracked.string('DEBUG'), @@ -104,7 +101,7 @@ ) ) -#process.MessageLogger.statistics = cms.untracked.vstring('cout') +#process.MessageLogger.cout.enableStatistics = cms.untracked.bool(True) #process.Tracer = cms.Service("Tracer") diff --git a/SimMuon/MCTruth/test/testReader_cfg.py b/SimMuon/MCTruth/test/testReader_cfg.py index f3394d08e5dd5..c948621073f6a 100644 --- a/SimMuon/MCTruth/test/testReader_cfg.py +++ b/SimMuon/MCTruth/test/testReader_cfg.py @@ -13,10 +13,8 @@ # MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories = cms.untracked.vstring('testReader', - 'FwkJob', 'FwkReport', 'FwkSummary', 'Root_NoDictionary') - process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), noTimeStamps = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), INFO = cms.untracked.PSet( @@ -41,13 +39,12 @@ ), Root_NoDictionary = cms.untracked.PSet( limit = cms.untracked.int32(0) - ) + ), + enableStatistics = cms.untracked.bool(True) ) -process.MessageLogger.statistics = cms.untracked.vstring('cout') - process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool(True) + enable = cms.untracked.bool(False) ) process.testanalyzer = cms.EDAnalyzer("testReader", diff --git a/SimMuon/MCTruth/test/testSeedToTrackProducer_cfg.py b/SimMuon/MCTruth/test/testSeedToTrackProducer_cfg.py index cba52fa212a99..7e355598b942f 100644 --- a/SimMuon/MCTruth/test/testSeedToTrackProducer_cfg.py +++ b/SimMuon/MCTruth/test/testSeedToTrackProducer_cfg.py @@ -6,7 +6,7 @@ # MessageLogger process.load("FWCore.MessageService.MessageLogger_cfi") -'''process.MessageLogger.categories = cms.untracked.vstring('SeedToTrackProducer') +''' process.MessageLogger.cout = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True), threshold = cms.untracked.string('INFO'), diff --git a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py index 79d9ee597410c..80a48f2a136e9 100644 --- a/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py +++ b/SimMuon/RPCDigitizer/test/runRPCDigiProducer_cfg.py @@ -124,19 +124,12 @@ ### that can be activated independently ################################################################ process.load("FWCore.MessageLogger.MessageLogger_cfi") -## process.MessageLogger.categories.append("RPCGeometry") -process.MessageLogger.categories.append("RPCDigiProducer") -## process.MessageLogger.categories.append("RPCSimSetup") -## process.MessageLogger.categories.append("RPCSimSetupClsLoopDetails") -## process.MessageLogger.categories.append("RPCSimSetupNoiseLoopDetails") -## process.MessageLogger.categories.append("RPCSimSetupChecks") -process.MessageLogger.categories.append("RPCSynchronizer") -process.MessageLogger.categories.append("RPCDigitizer") -process.MessageLogger.categories.append("RPCSimAsymmetricCls") -## process.MessageLogger.categories.append("RPCSimAverageNoiseEffCls") +## process.MessageLogger.debugModules = cms.untracked.vstring("*") -process.MessageLogger.destinations = cms.untracked.vstring("cout","junk") +process.MessageLogger.cerr.enable = False +process.MessageLogger.files.junk = dict() process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), threshold = cms.untracked.string("DEBUG"), default = cms.untracked.PSet( limit = cms.untracked.int32(0) ), FwkReport = cms.untracked.PSet( limit = cms.untracked.int32(-1) ), diff --git a/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py b/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py index f80faf90bebc5..db382c564f2a8 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py +++ b/SimTracker/TrackerMaterialAnalysis/test/TrackingMaterialAnalyser_dd4hep.py @@ -162,7 +162,7 @@ input = cms.untracked.int32(-1) ) -process.MessageLogger.destinations.extend(["LogTrackingMaterialAnalysis"]) -process.MessageLogger.categories.append("TrackingMaterialAnalysis") +process.MessageLogger.files.LogTrackingMaterialAnalysis = dict() + process.path = cms.Path(process.trackingMaterialAnalyser) diff --git a/SimTracker/TrackerMaterialAnalysis/test/listGroups_dd4hep.py b/SimTracker/TrackerMaterialAnalysis/test/listGroups_dd4hep.py index d5e0a6deaaa6d..db9f2f4c51e2c 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/listGroups_dd4hep.py +++ b/SimTracker/TrackerMaterialAnalysis/test/listGroups_dd4hep.py @@ -9,8 +9,8 @@ process = cms.Process("MaterialAnalyser") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('TrackingMaterialGroup') + + process.source = cms.Source("EmptySource") diff --git a/SimTracker/TrackerMaterialAnalysis/test/listIds_dd4hep.py b/SimTracker/TrackerMaterialAnalysis/test/listIds_dd4hep.py index 0fd122a3ac183..3a030a74db703 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/listIds_dd4hep.py +++ b/SimTracker/TrackerMaterialAnalysis/test/listIds_dd4hep.py @@ -9,8 +9,8 @@ process = cms.Process("MaterialAnalyser") process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ListIds') + + process.source = cms.Source("EmptySource") diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py index a69d047255e89..2e71f9c0a782c 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser.py @@ -43,24 +43,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialAnalyzer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialAnalyzer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialAnalyser'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialAnalyzer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialAnalyzer,val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py index 3b5fab62cf2e6..e434ed5b0120c 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHFNosePhaseII.py @@ -46,24 +46,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialAnalyzer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialAnalyzer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialAnalyser', 'MaterialAccountingGroup'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialAnalyzer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialAnalyzer, val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py index 2e57e5f442388..01e0c1f7c7b49 100644 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForHGCalPhaseII.py @@ -46,24 +46,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialAnalyzer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialAnalyzer= how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialAnalyser', 'MaterialAccountingGroup'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialAnalyzer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialAnalyzer,val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py index 215da51b9d3b0..f3534e3cc1ecc 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseI.py @@ -46,24 +46,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialAnalyzer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialAnalyzer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialAnalyser', 'MaterialAccountingGroup'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialAnalyzer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialAnalyzer,val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py index 2be15625b5785..bbfdd6e582797 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialAnalyser_ForPhaseII.py @@ -25,8 +25,8 @@ process.load('Configuration.Geometry.GeometryExtended2026D49Reco_cff') process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.destinations.extend(["LogTrackingMaterialAnalysis"]) -process.MessageLogger.categories.append("TrackingMaterialAnalysis") +process.MessageLogger.files.LogTrackingMaterialAnalysis = dict() + # Add our custom detector grouping to DDD process.XMLIdealGeometryESSource.geomXMLFiles.extend(['SimTracker/TrackerMaterialAnalysis/data/trackingMaterialGroups_ForPhaseII.xml']) diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py index 27d74b3b45eac..7a11ebabfcd63 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino.py @@ -64,24 +64,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialProducer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialProducer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialProducer'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialProducer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialProducer, val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py index 0314a4027a3e4..e27e571a4a347 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHFNosePhaseII.py @@ -63,24 +63,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialProducer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialProducer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialProducer'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialProducer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialProducer, val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py index 3c86f58bc3ec6..48c3ba38a947f 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForHGCalPhaseII.py @@ -63,24 +63,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialProducer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialProducer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialProducer'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialProducer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialProducer, val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py index 7f79baa97baad..c0efa3b9f4b38 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseI.py @@ -64,24 +64,22 @@ def customizeMessageLogger(process): # label for all defined python modules process.MessageLogger.debugModules.extend(['*']) # 2. Define destination and its default logging properties - destination = 'debugTrackingMaterialProducer' how_to_debug = cms.untracked.PSet(threshold = cms.untracked.string("DEBUG"), DEBUG = cms.untracked.PSet(limit = cms.untracked.int32(0)), default = cms.untracked.PSet(limit = cms.untracked.int32(0)), ) # 3. Attach destination and its logging properties to the main process - process.MessageLogger.destinations.extend([destination]) - process.MessageLogger._Parameterizable__addParameter(destination, how_to_debug) + process.MessageLogger.files.debugTrackingMaterialProducer = how_to_debug # 4. Define and extend the categories we would like to monitor log_debug_categories = ['TrackingMaterialProducer'] - process.MessageLogger.categories.extend(log_debug_categories) + # 5. Extend the configuration of the configured destination so that it # will trace all messages coming from the list of specified # categories. unlimit_debug = cms.untracked.PSet(limit = cms.untracked.int32(-1)) for val in log_debug_categories: - process.MessageLogger.debugTrackingMaterialProducer._Parameterizable__addParameter(val, unlimit_debug) + setattr(process.MessageLogger.files.debugTrackingMaterialProducer, val, unlimit_debug) return process diff --git a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py index 437446c6efe7a..4829ce0799caf 100755 --- a/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py +++ b/SimTracker/TrackerMaterialAnalysis/test/trackingMaterialProducer10GeVNeutrino_ForPhaseII.py @@ -8,8 +8,8 @@ process = cms.Process("Geometry") process.load('FWCore.MessageService.MessageLogger_cfi') -process.MessageLogger.destinations.extend(["debugTrackingMaterialProducer"]) -process.MessageLogger.categories.append("TrackingMaterialProducer") +process.MessageLogger.files.debugTrackingMaterialProducer = dict() + process.load('Configuration.EventContent.EventContent_cff') diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopElectron_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopElectron_cfg.py index 927da73bda200..76f9ef5a5b45b 100644 --- a/TopQuarkAnalysis/Examples/test/analyzeTopElectron_cfg.py +++ b/TopQuarkAnalysis/Examples/test/analyzeTopElectron_cfg.py @@ -5,7 +5,7 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = cms.untracked.string('INFO') -process.MessageLogger.categories = cms.untracked.vstring('TEST') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopGenEvent_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopGenEvent_cfg.py index 18ddcaf15640c..740fb95c3b607 100644 --- a/TopQuarkAnalysis/Examples/test/analyzeTopGenEvent_cfg.py +++ b/TopQuarkAnalysis/Examples/test/analyzeTopGenEvent_cfg.py @@ -6,7 +6,7 @@ process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = cms.untracked.string('INFO') ## dump content of TopGenEvent -process.MessageLogger.categories.append('TopGenEvent') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopHypotheses_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopHypotheses_cfg.py index ea754929736e4..d11c4765c9556 100644 --- a/TopQuarkAnalysis/Examples/test/analyzeTopHypotheses_cfg.py +++ b/TopQuarkAnalysis/Examples/test/analyzeTopHypotheses_cfg.py @@ -4,8 +4,8 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('TtSemiLeptonicEvent') -process.MessageLogger.categories.append('TtSemiLepKinFitter') + + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopJet_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopJet_cfg.py index 4c53090e0aa8d..224a285753ba0 100644 --- a/TopQuarkAnalysis/Examples/test/analyzeTopJet_cfg.py +++ b/TopQuarkAnalysis/Examples/test/analyzeTopJet_cfg.py @@ -5,7 +5,7 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = cms.untracked.string('INFO') -process.MessageLogger.categories = cms.untracked.vstring('TEST') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopMuon_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopMuon_cfg.py index b5b6f5eb13767..4e64bb3e322bf 100644 --- a/TopQuarkAnalysis/Examples/test/analyzeTopMuon_cfg.py +++ b/TopQuarkAnalysis/Examples/test/analyzeTopMuon_cfg.py @@ -5,7 +5,7 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = cms.untracked.string('INFO') -process.MessageLogger.categories = cms.untracked.vstring('TEST') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/Examples/test/analyzeTopTau_cfg.py b/TopQuarkAnalysis/Examples/test/analyzeTopTau_cfg.py index b7b03ee9712b1..8021e4bbf0cad 100644 --- a/TopQuarkAnalysis/Examples/test/analyzeTopTau_cfg.py +++ b/TopQuarkAnalysis/Examples/test/analyzeTopTau_cfg.py @@ -5,7 +5,7 @@ ## configure message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = cms.untracked.string('INFO') -process.MessageLogger.categories = cms.untracked.vstring('TEST') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/TopEventProducers/test/pseudoTop_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/pseudoTop_cfg.py index 83329a92791fb..7ee74c6ec12cb 100644 --- a/TopQuarkAnalysis/TopEventProducers/test/pseudoTop_cfg.py +++ b/TopQuarkAnalysis/TopEventProducers/test/pseudoTop_cfg.py @@ -5,7 +5,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -#process.MessageLogger.categories.append('ParticleListDrawer') +# from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar process.source = cms.Source("PoolSource", diff --git a/TopQuarkAnalysis/TopEventProducers/test/stGenEvent_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/stGenEvent_cfg.py index 9b524100539bf..4da4a075665ff 100644 --- a/TopQuarkAnalysis/TopEventProducers/test/stGenEvent_cfg.py +++ b/TopQuarkAnalysis/TopEventProducers/test/stGenEvent_cfg.py @@ -4,7 +4,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('ParticleListDrawer') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttDecaySubset_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttDecaySubset_cfg.py index 05f99aa100fb8..c34f973e92d07 100644 --- a/TopQuarkAnalysis/TopEventProducers/test/ttDecaySubset_cfg.py +++ b/TopQuarkAnalysis/TopEventProducers/test/ttDecaySubset_cfg.py @@ -4,7 +4,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('ParticleListDrawer') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttFullHadEvtBuilder_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttFullHadEvtBuilder_cfg.py index e93195eea96bb..1c5febe125cbc 100644 --- a/TopQuarkAnalysis/TopEventProducers/test/ttFullHadEvtBuilder_cfg.py +++ b/TopQuarkAnalysis/TopEventProducers/test/ttFullHadEvtBuilder_cfg.py @@ -5,7 +5,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TtFullHadronicEvent') + process.MessageLogger.cerr.TtFullHadronicEvent = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttFullLepEvtBuilder_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttFullLepEvtBuilder_cfg.py index 602d52f92305d..1cdb430093482 100644 --- a/TopQuarkAnalysis/TopEventProducers/test/ttFullLepEvtBuilder_cfg.py +++ b/TopQuarkAnalysis/TopEventProducers/test/ttFullLepEvtBuilder_cfg.py @@ -5,7 +5,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TtFullLeptonicEvent') + process.MessageLogger.cerr.TtFullLeptonicEvent = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/TopQuarkAnalysis/TopEventProducers/test/ttSemiLepEvtBuilder_cfg.py b/TopQuarkAnalysis/TopEventProducers/test/ttSemiLepEvtBuilder_cfg.py index c76813ce00dc8..2726959461754 100644 --- a/TopQuarkAnalysis/TopEventProducers/test/ttSemiLepEvtBuilder_cfg.py +++ b/TopQuarkAnalysis/TopEventProducers/test/ttSemiLepEvtBuilder_cfg.py @@ -5,9 +5,9 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopHitFit') -process.MessageLogger.categories.append('TtSemiLepKinFitter') -process.MessageLogger.categories.append('TtSemiLeptonicEvent') + + + process.MessageLogger.cerr.TtSemiLeptonicEvent = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/TopQuarkAnalysis/TopHitFit/test/ttSemiLepHitFitProducer_cfg.py b/TopQuarkAnalysis/TopHitFit/test/ttSemiLepHitFitProducer_cfg.py index 57fa9948f68b3..c7abbb680d0e6 100644 --- a/TopQuarkAnalysis/TopHitFit/test/ttSemiLepHitFitProducer_cfg.py +++ b/TopQuarkAnalysis/TopHitFit/test/ttSemiLepHitFitProducer_cfg.py @@ -5,7 +5,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TopHitFit') + ## define input from TopQuarkAnalysis.TopEventProducers.tqafInputFiles_cff import relValTTbar diff --git a/TopQuarkAnalysis/TopKinFitter/test/ttFullHadKinFitProducer_cfg.py b/TopQuarkAnalysis/TopKinFitter/test/ttFullHadKinFitProducer_cfg.py index 1a96b7bb63a22..b82aef05d11cc 100644 --- a/TopQuarkAnalysis/TopKinFitter/test/ttFullHadKinFitProducer_cfg.py +++ b/TopQuarkAnalysis/TopKinFitter/test/ttFullHadKinFitProducer_cfg.py @@ -5,8 +5,8 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TtFullHadKinFitter') -process.MessageLogger.categories.append('KinFitter') + + process.MessageLogger.cerr.TtFullHadKinFitter = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/TopQuarkAnalysis/TopKinFitter/test/ttSemiLepKinFitProducer_cfg.py b/TopQuarkAnalysis/TopKinFitter/test/ttSemiLepKinFitProducer_cfg.py index f2496803ce091..94a14cc17c0b0 100644 --- a/TopQuarkAnalysis/TopKinFitter/test/ttSemiLepKinFitProducer_cfg.py +++ b/TopQuarkAnalysis/TopKinFitter/test/ttSemiLepKinFitProducer_cfg.py @@ -5,8 +5,8 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('TtSemiLepKinFitter') -process.MessageLogger.categories.append('KinFitter') + + process.MessageLogger.cerr.TtSemiLepKinFitter = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/TopQuarkAnalysis/TopSkimming/test/ttDecayChannelFilters_cfg.py b/TopQuarkAnalysis/TopSkimming/test/ttDecayChannelFilters_cfg.py index 67062394fa365..468c0ceb5f5a5 100644 --- a/TopQuarkAnalysis/TopSkimming/test/ttDecayChannelFilters_cfg.py +++ b/TopQuarkAnalysis/TopSkimming/test/ttDecayChannelFilters_cfg.py @@ -4,8 +4,8 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories.append('ParticleListDrawer') -process.MessageLogger.categories.append('TtDecayChannelSelector') + + process.MessageLogger.cerr.TtDecayChannelSelector = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/TopQuarkAnalysis/TopTools/test/ttJetPartonMatch_cfg.py b/TopQuarkAnalysis/TopTools/test/ttJetPartonMatch_cfg.py index c4b63fd640caf..083d4e90216ed 100644 --- a/TopQuarkAnalysis/TopTools/test/ttJetPartonMatch_cfg.py +++ b/TopQuarkAnalysis/TopTools/test/ttJetPartonMatch_cfg.py @@ -5,7 +5,7 @@ ## add message logger process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.threshold = 'INFO' -process.MessageLogger.categories.append('JetPartonMatching') + process.MessageLogger.cerr.JetPartonMatching = cms.untracked.PSet( limit = cms.untracked.int32(-1) ) diff --git a/Validation/Configuration/test/HarvestingGlobalValidation_RelVal.py b/Validation/Configuration/test/HarvestingGlobalValidation_RelVal.py index e727bad4ee21f..f71ae00c9dd3e 100644 --- a/Validation/Configuration/test/HarvestingGlobalValidation_RelVal.py +++ b/Validation/Configuration/test/HarvestingGlobalValidation_RelVal.py @@ -34,7 +34,7 @@ # Other statements #Adding DQMFileSaver to the message logger configuration -process.MessageLogger.categories.append('DQMFileSaver') + process.MessageLogger.cout.DQMFileSaver = cms.untracked.PSet( limit = cms.untracked.int32(1000000) ) diff --git a/Validation/EventGenerator/test/convertLHE2HepMCReweightandValidate8TeV_cfg.py b/Validation/EventGenerator/test/convertLHE2HepMCReweightandValidate8TeV_cfg.py index 484a81600a5fa..c9a4cb96fe460 100644 --- a/Validation/EventGenerator/test/convertLHE2HepMCReweightandValidate8TeV_cfg.py +++ b/Validation/EventGenerator/test/convertLHE2HepMCReweightandValidate8TeV_cfg.py @@ -1,15 +1,7 @@ import FWCore.ParameterSet.Config as cms process = cms.Process("convertLHE2HepMC") -process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'Generator' - ,'LHEInterface' - ) - +process.load("FWCore.MessageLogger.MessageLogger_cfi") process.MessageLogger.cerr.INFO = cms.untracked.PSet(limit = cms.untracked.int32(-1)) process.MessageLogger.cerr.Generator = cms.untracked.PSet(limit = cms.untracked.int32(0)) diff --git a/Validation/Geometry/test/runP_Castor_Debug_cfg.py b/Validation/Geometry/test/runP_Castor_Debug_cfg.py index e006dde5346e7..c95a60412e28f 100644 --- a/Validation/Geometry/test/runP_Castor_Debug_cfg.py +++ b/Validation/Geometry/test/runP_Castor_Debug_cfg.py @@ -21,8 +21,8 @@ process.RandomNumberGeneratorService.generator.initialSeed = 456789 process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MaterialBudget') + + process.source = cms.Source("EmptySource", firstRun = cms.untracked.uint32(1), diff --git a/Validation/Geometry/test/runP_HCAL_Debug_cfg.py b/Validation/Geometry/test/runP_HCAL_Debug_cfg.py index 4af01ca828e1d..2ee114b9ad1dc 100644 --- a/Validation/Geometry/test/runP_HCAL_Debug_cfg.py +++ b/Validation/Geometry/test/runP_HCAL_Debug_cfg.py @@ -18,9 +18,9 @@ process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789 process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MaterialBudget') -# process.MessageLogger.categories.append('MaterialBudgetFull') + + +# process.source = cms.Source("EmptySource", firstRun = cms.untracked.uint32(1), diff --git a/Validation/Geometry/test/runP_HCAL_Debug_dd4hep_cfg.py b/Validation/Geometry/test/runP_HCAL_Debug_dd4hep_cfg.py index 015ba29cc02ab..0b829cc826c90 100644 --- a/Validation/Geometry/test/runP_HCAL_Debug_dd4hep_cfg.py +++ b/Validation/Geometry/test/runP_HCAL_Debug_dd4hep_cfg.py @@ -17,9 +17,9 @@ process.RandomNumberGeneratorService.VtxSmeared.initialSeed = 123456789 process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MaterialBudget') -# process.MessageLogger.categories.append('MaterialBudgetFull') + + +# process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer", confGeomXMLFiles = cms.FileInPath('Validation/Geometry/data/cmsExtendedGeometryNoMuon2021.xml'), diff --git a/Validation/Geometry/test/runP_HCAL_cfg.py b/Validation/Geometry/test/runP_HCAL_cfg.py index fdaab9743cbc7..d767d35fe2e74 100644 --- a/Validation/Geometry/test/runP_HCAL_cfg.py +++ b/Validation/Geometry/test/runP_HCAL_cfg.py @@ -12,8 +12,8 @@ process.RandomNumberGeneratorService.g4SimHits.initialSeed = 9876 process.load('FWCore.MessageService.MessageLogger_cfi') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('MaterialBudget') + + process.source = cms.Source("PoolSource", noEventSort = cms.untracked.bool(True), diff --git a/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py b/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py index 3e99e2e1fe9aa..a59d46f95e90a 100644 --- a/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py +++ b/Validation/HGCalValidation/test/python/protoHGCalSimWatcher_cfg.py @@ -76,9 +76,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/protoSimValid_cfg.py b/Validation/HGCalValidation/test/python/protoSimValid_cfg.py index 5a0b0ce5fc9da..51771e6a9d38e 100644 --- a/Validation/HGCalValidation/test/python/protoSimValid_cfg.py +++ b/Validation/HGCalValidation/test/python/protoSimValid_cfg.py @@ -98,8 +98,8 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/protoValid_cfg.py b/Validation/HGCalValidation/test/python/protoValid_cfg.py index 5945a34d5f62d..2bfc8d133c91a 100644 --- a/Validation/HGCalValidation/test/python/protoValid_cfg.py +++ b/Validation/HGCalValidation/test/python/protoValid_cfg.py @@ -122,8 +122,8 @@ process.GlobalTag.globaltag = autoCond['phase2_realistic'] process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') + + if (options.type == "hgcalSimHitStudy"): process.load('Validation.HGCalValidation.hgcSimHitStudy_cfi') diff --git a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py index 5150c9fd5cad5..54659b40532a6 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseDigiStudy_cfg.py @@ -14,9 +14,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalValidation') - process.MessageLogger.categories.append('HGCalGeom') + + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py index 996c06ba80fc3..6c73ad6290996 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseRecHitStudy_cfg.py @@ -17,8 +17,8 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') process.MessageLogger.cerr.FwkReport.reportEvery = 2 -if 'MessageLogger' in process.__dict__: - process.MessageLogger.categories.append('HGCalValidation') + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py index 2b3a3bc0c765f..51b03aa87403e 100644 --- a/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHFNoseSimHitStudy_cfg.py @@ -14,8 +14,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalValidation') + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py b/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py index b4e879d28c357..9a98b93ef061c 100644 --- a/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCGeomCheck_cfg.py @@ -30,9 +30,9 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalValid') - process.MessageLogger.categories.append('HGCalGeom') + + + process.MessageLogger.cerr.FwkReport.reportEvery = 100 process.source = cms.Source("PoolSource", diff --git a/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py b/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py index d659c1fa6b08f..3bc0c83cb87a0 100644 --- a/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCHitAnalyzer_cfg.py @@ -32,8 +32,8 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') #process.MessageLogger.cerr.FwkReport.reportEvery = 100 -#if 'MessageLogger' in process.__dict__: -# process.MessageLogger.categories.append('HGCalValid') +# +# process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py index 0668df1c56b71..127e8ef87ee07 100644 --- a/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalDigiStudy_cfg.py @@ -14,8 +14,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -#if hasattr(process,'MessageLogger'): -# process.MessageLogger.categories.append('HGCalValidation') +# +# process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py index 8e46b0c640f04..e532b1b7090d7 100644 --- a/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalRecHitStudy_cfg.py @@ -17,8 +17,8 @@ process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:phase2_realistic', '') process.MessageLogger.cerr.FwkReport.reportEvery = 2 -#if 'MessageLogger' in process.__dict__: -# process.MessageLogger.categories.append('HGCalValidation') +# +# process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('file:step3.root') diff --git a/Validation/HGCalValidation/test/python/runHGCalWaferHitCheck_cfg.py b/Validation/HGCalValidation/test/python/runHGCalWaferHitCheck_cfg.py index e4e1f599f92bf..f83f5cc79a656 100644 --- a/Validation/HGCalValidation/test/python/runHGCalWaferHitCheck_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalWaferHitCheck_cfg.py @@ -14,9 +14,9 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalValidation') -# process.MessageLogger.categories.append('HGCalGeom') + + +# process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring('file:step1.root') diff --git a/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py b/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py index f0f7681fd9c3a..41f215d23ff7a 100644 --- a/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/runHGCalWaferStudy_cfg.py @@ -29,8 +29,8 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalValidation') + + process.source = cms.Source("PoolSource", fileNames = cms.untracked.vstring( diff --git a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py index 06996384d367e..6a4c4615419cb 100644 --- a/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHFNoseSimHitStudy_cfg.py @@ -27,10 +27,10 @@ output = cms.optional.untracked.allowed(cms.int32,cms.PSet) ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HGCalGeom') - process.MessageLogger.categories.append('HFNSim') - process.MessageLogger.categories.append('HGCalValidation') + + + + # Input source diff --git a/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py b/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py index 463cf843cf16a..adf3fdd63f1f6 100644 --- a/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalBHValid_cfg.py @@ -48,9 +48,9 @@ name = cms.untracked.string('Applications') ) -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HcalSim') + + + # Additional output definition process.load('Validation.HGCalValidation.hgcalBHValidation_cfi') diff --git a/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py index 5ac84502f93bb..94b7a01ee0a38 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimHitStudy_cfg.py @@ -32,10 +32,10 @@ from Configuration.AlCa.autoCond import autoCond process.GlobalTag.globaltag = autoCond['phase2_realistic'] -#if hasattr(process,'MessageLogger'): -# process.MessageLogger.categories.append('HGCalGeom') -# process.MessageLogger.categories.append('HGCSim') -# process.MessageLogger.categories.append('HGCalValidation') +# +# +# +# process.load("IOMC.RandomEngine.IOMC_cff") process.RandomNumberGeneratorService.generator.initialSeed = 456789 diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py index 44a64c9b8cb9b..05c0162bb5e7f 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV10_cfg.py @@ -34,9 +34,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py index 340fe94a053d4..c380155180f91 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV11_cfg.py @@ -32,9 +32,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV12_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV12_cfg.py index 93586d23b272a..0195a13aa1b4a 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV12_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV12_cfg.py @@ -32,9 +32,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py index 5af486c6a07f0..041b1dee5df40 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV13_cfg.py @@ -34,9 +34,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV14_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV14_cfg.py index 99fc245985e7b..f671a8984237d 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV14_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV14_cfg.py @@ -34,9 +34,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV8_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV8_cfg.py index 956964626c22c..f49bb27b8e217 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV8_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV8_cfg.py @@ -31,9 +31,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py index b5ce21fa98c2f..c73b6fe27cc67 100644 --- a/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py +++ b/Validation/HGCalValidation/test/python/testHGCalSimWatcherV9_cfg.py @@ -34,9 +34,9 @@ ) process.MessageLogger.cerr.FwkReport.reportEvery = 5 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('ValidHGCal') - process.MessageLogger.categories.append('HGCalGeom') + + + # Input source process.source = cms.Source("EmptySource") diff --git a/Validation/HcalDigis/test/runZdc_digi_cfg.py b/Validation/HcalDigis/test/runZdc_digi_cfg.py index 781a652392fae..bf1dcf9008613 100644 --- a/Validation/HcalDigis/test/runZdc_digi_cfg.py +++ b/Validation/HcalDigis/test/runZdc_digi_cfg.py @@ -129,29 +129,10 @@ def customise(process): #Tweak Message logger to dump G4cout and G4cerr messages in G4msg.log #print process.MessageLogger.__dict__ - process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'CaloSim' - ,'ForwardSim' - ) - process.MessageLogger.debugModules=cms.untracked.vstring('g4SimHits') #Configuring the G4msg.log output - process.MessageLogger.G4msg = cms.untracked.PSet( + process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -176,7 +157,7 @@ def customise(process): ,CaloSim = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,ForwardSim = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) - + ) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) process.options = cms.untracked.PSet( diff --git a/Validation/HcalHits/test/runHcalGeomCheckStep1_cfg.py b/Validation/HcalHits/test/runHcalGeomCheckStep1_cfg.py index 7f5dec7dbd892..19ec3c402f25c 100644 --- a/Validation/HcalHits/test/runHcalGeomCheckStep1_cfg.py +++ b/Validation/HcalHits/test/runHcalGeomCheckStep1_cfg.py @@ -20,8 +20,8 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:mc', '') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HcalValidation') + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(5000) diff --git a/Validation/HcalHits/test/runHcalGeomCheckStep2_cfg.py b/Validation/HcalHits/test/runHcalGeomCheckStep2_cfg.py index b25cf83d92902..7d86220ad4670 100644 --- a/Validation/HcalHits/test/runHcalGeomCheckStep2_cfg.py +++ b/Validation/HcalHits/test/runHcalGeomCheckStep2_cfg.py @@ -12,8 +12,8 @@ from Configuration.AlCa.GlobalTag import GlobalTag process.GlobalTag = GlobalTag(process.GlobalTag, 'auto:mc', '') -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HcalValidation') + + process.source = cms.Source("PoolSource", diff --git a/Validation/HcalHits/test/runZdc_cfg.py b/Validation/HcalHits/test/runZdc_cfg.py index 5fe9e09cac2d7..58b2b9675781d 100644 --- a/Validation/HcalHits/test/runZdc_cfg.py +++ b/Validation/HcalHits/test/runZdc_cfg.py @@ -89,29 +89,10 @@ def customise(process): #Tweak Message logger to dump G4cout and G4cerr messages in G4msg.log #print process.MessageLogger.__dict__ - process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'CaloSim' - ,'ForwardSim' - ) - process.MessageLogger.debugModules=cms.untracked.vstring('g4SimHits') #Configuring the G4msg.log output - process.MessageLogger.G4msg = cms.untracked.PSet( + process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -136,7 +117,7 @@ def customise(process): ,CaloSim = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,ForwardSim = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) - + ) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) process.options = cms.untracked.PSet( diff --git a/Validation/HcalHits/test/runZdc_digi_cfg.py b/Validation/HcalHits/test/runZdc_digi_cfg.py index 4f5f0e51623d3..f2e9e3061c510 100644 --- a/Validation/HcalHits/test/runZdc_digi_cfg.py +++ b/Validation/HcalHits/test/runZdc_digi_cfg.py @@ -129,29 +129,10 @@ def customise(process): #Tweak Message logger to dump G4cout and G4cerr messages in G4msg.log #print process.MessageLogger.__dict__ - process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ,'CaloSim' - ,'ForwardSim' - ) - process.MessageLogger.debugModules=cms.untracked.vstring('g4SimHits') #Configuring the G4msg.log output - process.MessageLogger.G4msg = cms.untracked.PSet( + process.MessageLogger.files.G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') diff --git a/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py b/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py index 49fc9b23e587c..4751a8a60ccb0 100644 --- a/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py +++ b/Validation/HcalRecHits/test/runHcalDumpHits_cfg.py @@ -15,8 +15,8 @@ process.GlobalTag.globaltag = autoCond['phase2_realistic'] process.MessageLogger.cerr.FwkReport.reportEvery = 1 -if hasattr(process,'MessageLogger'): - process.MessageLogger.categories.append('HcalValidation') + + process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(-1) diff --git a/Validation/Performance/python/TimeMemoryG4Info.py b/Validation/Performance/python/TimeMemoryG4Info.py index dbf19e5b9f5ad..ffb703fcd8350 100644 --- a/Validation/Performance/python/TimeMemoryG4Info.py +++ b/Validation/Performance/python/TimeMemoryG4Info.py @@ -10,24 +10,8 @@ def customise(process): #Tweak Message logger to dump G4cout and G4cerr messages in G4msg.log #print process.MessageLogger.__dict__ - process.MessageLogger.destinations=cms.untracked.vstring('cout' - ,'cerr' - ,'G4msg' - ) - process.MessageLogger.categories=cms.untracked.vstring('FwkJob' - ,'FwkReport' - ,'FwkSummary' - ,'Root_NoDictionary' - ,'TimeReport' - ,'TimeModule' - ,'TimeEvent' - ,'MemoryCheck' - ,'PhysicsList' - ,'G4cout' - ,'G4cerr' - ) #Configuring the G4msg.log output - process.MessageLogger.G4msg = cms.untracked.PSet( + process.MessageLogger.files = dict(G4msg = cms.untracked.PSet( noTimeStamps = cms.untracked.bool(True) #First eliminate unneeded output ,threshold = cms.untracked.string('INFO') @@ -49,7 +33,7 @@ def customise(process): ,G4cout = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ,G4cerr = cms.untracked.PSet(limit = cms.untracked.int32(-1)) ) - + ) #Add these 3 lines to put back the summary for timing information at the end of the logfile #(needed for TimeReport report) if hasattr(process,'options'): diff --git a/Validation/Performance/python/TimeMemoryJobReport.py b/Validation/Performance/python/TimeMemoryJobReport.py index bca720ab1f136..bb173a58121bb 100644 --- a/Validation/Performance/python/TimeMemoryJobReport.py +++ b/Validation/Performance/python/TimeMemoryJobReport.py @@ -21,7 +21,7 @@ def customiseWithTimeMemoryJobReport(process): ) #Silence the final Timing service report - process.MessageLogger.categories.append("TimeReport") + process.MessageLogger.cerr.TimeReport = cms.untracked.PSet(limit = cms.untracked.int32(0)) return(process) diff --git a/Validation/RecoMuon/test/muonValidation_cfg.py b/Validation/RecoMuon/test/muonValidation_cfg.py index c89d0ebaab6a7..46765af3f88bd 100644 --- a/Validation/RecoMuon/test/muonValidation_cfg.py +++ b/Validation/RecoMuon/test/muonValidation_cfg.py @@ -25,7 +25,7 @@ process.outpath = cms.EndPath(process.out) process.load("FWCore.MessageLogger.MessageLogger_cfi") -process.MessageLogger.categories = ['TrackAssociator', 'TrackValidator'] + process.MessageLogger.debugModules = ['*'] process.MessageLogger.cout = cms.untracked.PSet( threshold = cms.untracked.string('DEBUG'), @@ -40,7 +40,7 @@ ) ) process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool(True) + enable = cms.untracked.bool(False) ) process.load('Configuration/StandardSequences/RawToDigi_cff') diff --git a/Validation/RecoTau/Tools/CreateSqliteForCondDB_cfg.py b/Validation/RecoTau/Tools/CreateSqliteForCondDB_cfg.py index 199fc84526200..3bc01797775f9 100644 --- a/Validation/RecoTau/Tools/CreateSqliteForCondDB_cfg.py +++ b/Validation/RecoTau/Tools/CreateSqliteForCondDB_cfg.py @@ -68,10 +68,9 @@ ) process.load( "FWCore.MessageLogger.MessageLogger_cfi" ) -process.MessageLogger.cerr = cms.untracked.PSet( - placeholder = cms.untracked.bool( True ) -) +process.MessageLogger.cerr.enable = False process.MessageLogger.cout = cms.untracked.PSet( + enable = cms.untracked.bool(True), INFO = cms.untracked.PSet( reportEvery = cms.untracked.int32( 1 ) ) diff --git a/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py b/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py index 2d9cce9ee9752..0aa7be87d38b1 100644 --- a/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py +++ b/Validation/RecoTrack/test/MultiTrackValidatorGenPs_cfg.py @@ -4,7 +4,7 @@ # message logger process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.categories.extend(["TwoTrackMinimumDistanceLineLine"]) + process.MessageLogger.TwoTrackMinimumDistanceLineLine = cms.untracked.PSet( reportEvery = cms.untracked.int32(1), limit = cms.untracked.int32( 10 ) diff --git a/Validation/RecoVertex/test/allanalyzer_example_cfg.py b/Validation/RecoVertex/test/allanalyzer_example_cfg.py index 9da97bb19ecd9..e8e37e91af25a 100644 --- a/Validation/RecoVertex/test/allanalyzer_example_cfg.py +++ b/Validation/RecoVertex/test/allanalyzer_example_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/Validation/RecoVertex/test/bspvanalyzer_cfg.py b/Validation/RecoVertex/test/bspvanalyzer_cfg.py index 0a07d6a3f997b..360930cd3a917 100644 --- a/Validation/RecoVertex/test/bspvanalyzer_cfg.py +++ b/Validation/RecoVertex/test/bspvanalyzer_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py b/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py index da00deac211fe..33b934a5ae4de 100644 --- a/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py +++ b/Validation/RecoVertex/test/mcverticesanalyzer_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py b/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py index ebc3677931021..f7892793564d5 100644 --- a/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py +++ b/Validation/RecoVertex/test/mcverticessimpleanalyzer_cfg.py @@ -24,7 +24,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -33,7 +33,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py b/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py index c42532511844a..505ddf21cc41f 100644 --- a/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py +++ b/Validation/RecoVertex/test/mcverticestriggerbiasanalyzer_cfg.py @@ -50,7 +50,7 @@ process.load("FWCore.MessageService.MessageLogger_cfi") -process.MessageLogger.cout.placeholder = cms.untracked.bool(False) +process.MessageLogger.cout.enable = cms.untracked.bool(True) process.MessageLogger.cout.threshold = cms.untracked.string("INFO") process.MessageLogger.cout.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) @@ -59,7 +59,7 @@ reportEvery = cms.untracked.int32(10000) ) -process.MessageLogger.cerr.placeholder = cms.untracked.bool(False) +process.MessageLogger.cerr.enable = cms.untracked.bool(True) process.MessageLogger.cerr.threshold = cms.untracked.string("WARNING") process.MessageLogger.cerr.default = cms.untracked.PSet( limit = cms.untracked.int32(10000000) diff --git a/Validation/TrackerConfiguration/test/HarvestingGlobalValidation_Tracking.py b/Validation/TrackerConfiguration/test/HarvestingGlobalValidation_Tracking.py index 6ee789ada4a1d..f8929a794a2c6 100644 --- a/Validation/TrackerConfiguration/test/HarvestingGlobalValidation_Tracking.py +++ b/Validation/TrackerConfiguration/test/HarvestingGlobalValidation_Tracking.py @@ -47,7 +47,7 @@ # Other statements #Adding DQMFileSaver to the message logger configuration -process.MessageLogger.categories.append('DQMFileSaver') + process.MessageLogger.cout.DQMFileSaver = cms.untracked.PSet( limit = cms.untracked.int32(1000000) )