From 011fac9974a9afce9bf9602335707b9d0a6bf1a2 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 16 May 2017 11:32:31 +0200 Subject: [PATCH 1/3] printout cleanup - added bonus - finished migration for L1 --- .../StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py | 4 ++-- DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py | 2 +- L1Trigger/Configuration/python/L1TDigiToRaw_cff.py | 3 --- L1Trigger/Configuration/python/L1TRawToDigi_cff.py | 3 --- L1Trigger/L1TCalorimeter/python/hackConditions_cff.py | 3 --- L1Trigger/L1TCalorimeter/python/simDigis_cff.py | 3 --- L1Trigger/L1TGlobal/python/hackConditions_cff.py | 3 +-- L1Trigger/L1TGlobal/python/simDigis_cff.py | 2 -- L1Trigger/L1TMuon/python/hackConditions_cff.py | 1 - L1Trigger/L1TMuon/python/simDigis_cff.py | 2 -- PhysicsTools/PatAlgos/python/tools/jetTools.py | 1 - PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py | 2 +- 12 files changed, 5 insertions(+), 24 deletions(-) diff --git a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py index 31c7d1673ebb4..ca74888766662 100644 --- a/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py +++ b/Configuration/StandardSequences/python/SimL1EmulatorRepack_GT2_cff.py @@ -11,8 +11,8 @@ InputLabel = cms.InputTag( 'rawDataCollector', processName=cms.InputTag.skipCurrentProcess()) ) -import L1Trigger.L1TCommon.caloStage1LegacyFormatDigis_cfi -unpackGctDigis = L1Trigger.L1TCommon.caloStage1LegacyFormatDigis_cfi.caloStage1LegacyFormatDigis.clone( +import L1Trigger.L1TCalorimeter.caloStage1LegacyFormatDigis_cfi +unpackGctDigis = L1Trigger.L1TCalorimeter.caloStage1LegacyFormatDigis_cfi.caloStage1LegacyFormatDigis.clone( InputCollection = cms.InputTag("unpackGctStage1"), InputRlxTauCollection = cms.InputTag("unpackGctStage1:rlxTaus"), InputIsoTauCollection = cms.InputTag("unpackGctStage1:isoTaus"), diff --git a/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py b/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py index dba77fb76cc55..cc8833039cab6 100644 --- a/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py +++ b/DQM/L1TMonitor/python/L1TEmulatorMonitor_cff.py @@ -63,7 +63,7 @@ # transfer stage1 format digis to legacy format digis -from L1Trigger.L1TCommon.caloStage1LegacyFormatDigis_cfi import * +from L1Trigger.L1TCalorimeter.caloStage1LegacyFormatDigis_cfi import * ############################################################ diff --git a/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py b/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py index 6fedc79283992..dd83ed05eae09 100644 --- a/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py +++ b/L1Trigger/Configuration/python/L1TDigiToRaw_cff.py @@ -21,7 +21,6 @@ # Legacy Trigger: # if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): - sys.stderr.write("L1TDigiToRaw Sequence configured for Run1 (Legacy) trigger. \n") # legacy L1 packages: from EventFilter.CSCTFRawToDigi.csctfpacker_cfi import * from EventFilter.DTTFRawToDigi.dttfpacker_cfi import * @@ -42,7 +41,6 @@ # Stage-1 Trigger # if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): - sys.stderr.write("L1TDigiToRaw Sequence configured for Stage-1 (2015) trigger. \n") # legacy L1 packers, still in use for 2015: from EventFilter.CSCTFRawToDigi.csctfpacker_cfi import * from EventFilter.DTTFRawToDigi.dttfpacker_cfi import * @@ -67,7 +65,6 @@ # Stage-2 Trigger # if stage2L1Trigger.isChosen(): - sys.stderr.write("L1TDigiToRaw Sequence configured for Stage-2 (2016) trigger. \n") from EventFilter.L1TRawToDigi.caloStage2Raw_cfi import * from EventFilter.L1TRawToDigi.gmtStage2Raw_cfi import * from EventFilter.L1TRawToDigi.gtStage2Raw_cfi import * diff --git a/L1Trigger/Configuration/python/L1TRawToDigi_cff.py b/L1Trigger/Configuration/python/L1TRawToDigi_cff.py index 1b62b77dbccb4..db0d852405284 100644 --- a/L1Trigger/Configuration/python/L1TRawToDigi_cff.py +++ b/L1Trigger/Configuration/python/L1TRawToDigi_cff.py @@ -70,7 +70,6 @@ def unpack_stage2(): from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): - sys.stderr.write("L1TRawToDigi Sequence configured for Run1 (Legacy) trigger. \n") unpack_legacy() L1TRawToDigi = cms.Sequence(L1TRawToDigi_Legacy); @@ -78,7 +77,6 @@ def unpack_stage2(): # Stage-1 Trigger # if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): - sys.stderr.write("L1TRawToDigi Sequence configured for Stage-1 (2015) trigger. \n") unpack_stage1() L1TRawToDigi = cms.Sequence(L1TRawToDigi_Stage1) @@ -86,7 +84,6 @@ def unpack_stage2(): # Stage-2 Trigger: fow now, unpack Stage 1 and Stage 2 (in case both available) # if stage2L1Trigger.isChosen(): - sys.stderr.write("L1TRawToDigi Sequence configured for Stage-2 (2016) trigger. \n") unpack_stage1() unpack_stage2() L1TRawToDigi = cms.Sequence(L1TRawToDigi_Stage1+L1TRawToDigi_Stage2) diff --git a/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py b/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py index 592e7ad1a4a86..fc9258992b55c 100644 --- a/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py +++ b/L1Trigger/L1TCalorimeter/python/hackConditions_cff.py @@ -24,7 +24,6 @@ # Stage-1 Trigger # if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): - sys.stderr.write("L1TCalorimeter Conditions configured for Stage-1 (2015) trigger. \n") # Switch between HI and PP calo configuration: if (run2_HI_specific.isChosen()): from L1Trigger.L1TCalorimeter.caloConfigStage1HI_cfi import * @@ -39,10 +38,8 @@ # if stage2L1Trigger.isChosen(): if pA_2016.isChosen(): - sys.stderr.write("L1TCalorimeter Conditions configured for Stage-2 (2016 pA) trigger. \n") from L1Trigger.L1TCalorimeter.caloStage2Params_2016_v3_3_1_HI_cfi import * else: - sys.stderr.write("L1TCalorimeter Conditions configured for Stage-2 (2016) trigger. \n") from L1Trigger.L1TCalorimeter.caloStage2Params_2016_v3_3_1_cfi import * # What about CaloConfig? Related: How will we switch PP/HH? diff --git a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py index 47114ebd43725..608b01b364bbf 100644 --- a/L1Trigger/L1TCalorimeter/python/simDigis_cff.py +++ b/L1Trigger/L1TCalorimeter/python/simDigis_cff.py @@ -7,7 +7,6 @@ from Configuration.Eras.Modifier_stage1L1Trigger_cff import stage1L1Trigger from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger if not (stage1L1Trigger.isChosen() or stage2L1Trigger.isChosen()): - sys.stderr.write("L1TCalorimeter Sequence configured for Run1 (Legacy) trigger. \n") # - RCT (Regional Calorimeter Trigger) emulator import L1Trigger.RegionalCaloTrigger.rctDigis_cfi simRctDigis = L1Trigger.RegionalCaloTrigger.rctDigis_cfi.rctDigis.clone() @@ -23,7 +22,6 @@ # Stage-1 Trigger # if stage1L1Trigger.isChosen() and not stage2L1Trigger.isChosen(): - sys.stderr.write("L1TCalorimeter Sequence configured for Stage-1 (2015) trigger. \n") # # - RCT (Regional Calorimeter Trigger) emulator # @@ -43,7 +41,6 @@ # Stage-2 Trigger # if stage2L1Trigger.isChosen(): - sys.stderr.write("L1TCalorimeter Sequence configured for Stage-2 (2016) trigger. \n") # select one of the following two options: # - layer1 from L1Trigger/L1TCalorimeter package #from L1Trigger.L1TCalorimeter.simCaloStage2Layer1Digis_cfi import simCaloStage2Layer1Digis diff --git a/L1Trigger/L1TGlobal/python/hackConditions_cff.py b/L1Trigger/L1TGlobal/python/hackConditions_cff.py index ec35414455694..ba9ea6fc7672d 100644 --- a/L1Trigger/L1TGlobal/python/hackConditions_cff.py +++ b/L1Trigger/L1TGlobal/python/hackConditions_cff.py @@ -30,8 +30,7 @@ # Stage-2 Trigger # if stage2L1Trigger.isChosen(): - sys.stderr.write("L1TGlobal Conditions configured for Stage-2 (2016) trigger. \n") - from L1Trigger.L1TGlobal.StableParameters_cff import * + from L1Trigger.L1TGlobal.GlobalParameters_cff import * # from L1Trigger.L1TGlobal.GlobalParameters_cff import * from L1Trigger.L1TGlobal.PrescalesVetos_cff import * # from L1Trigger.L1TGlobal.TriggerMenu_cff import * diff --git a/L1Trigger/L1TGlobal/python/simDigis_cff.py b/L1Trigger/L1TGlobal/python/simDigis_cff.py index b4494740b7ca1..21131eb4295c0 100644 --- a/L1Trigger/L1TGlobal/python/simDigis_cff.py +++ b/L1Trigger/L1TGlobal/python/simDigis_cff.py @@ -10,7 +10,6 @@ # from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger if not (stage2L1Trigger.isChosen()): - sys.stderr.write("L1TGlobal Sequence configured for Legacy trigger (Run1 and Run 2015). \n") # # - Global Trigger emulator # @@ -33,6 +32,5 @@ # # - Global Trigger emulator # - sys.stderr.write("L1TGlobal Sequence configured for Stage-2 (2016) trigger. \n") from L1Trigger.L1TGlobal.simGtStage2Digis_cfi import * SimL1TGlobal = cms.Sequence(simGtStage2Digis) diff --git a/L1Trigger/L1TMuon/python/hackConditions_cff.py b/L1Trigger/L1TMuon/python/hackConditions_cff.py index cc446f9d7ae39..33ea7c7eed531 100644 --- a/L1Trigger/L1TMuon/python/hackConditions_cff.py +++ b/L1Trigger/L1TMuon/python/hackConditions_cff.py @@ -25,7 +25,6 @@ # Stage-2 Trigger # if stage2L1Trigger.isChosen(): - sys.stderr.write("L1TMuon Conditions configured for Stage-2 (2016) trigger. \n") from L1Trigger.L1TMuonBarrel.fakeBmtfParams_cff import * from L1Trigger.L1TMuonOverlap.fakeOmtfParams_cff import * from L1Trigger.L1TMuonEndCap.fakeEmtfParams_cff import * diff --git a/L1Trigger/L1TMuon/python/simDigis_cff.py b/L1Trigger/L1TMuon/python/simDigis_cff.py index 95a1b7997a75b..e3434fe4b58ba 100644 --- a/L1Trigger/L1TMuon/python/simDigis_cff.py +++ b/L1Trigger/L1TMuon/python/simDigis_cff.py @@ -26,7 +26,6 @@ # from Configuration.Eras.Modifier_stage2L1Trigger_cff import stage2L1Trigger if not (stage2L1Trigger.isChosen()): - sys.stderr.write("L1TMuon Sequence configured for Legacy trigger (Run1 and Run 2015). \n") # # - CSC Track Finder emulator # @@ -69,7 +68,6 @@ # Stage-2 Trigger # if stage2L1Trigger.isChosen(): - sys.stderr.write("L1TMuon Sequence configured for Stage-2 (2016) trigger. \n") from L1Trigger.L1TMuonBarrel.simTwinMuxDigis_cfi import * from L1Trigger.L1TMuonBarrel.simBmtfDigis_cfi import * from L1Trigger.L1TMuonEndCap.simEmtfDigis_cfi import * diff --git a/PhysicsTools/PatAlgos/python/tools/jetTools.py b/PhysicsTools/PatAlgos/python/tools/jetTools.py index 2dad8a94eaf98..7a1c3b634fa21 100644 --- a/PhysicsTools/PatAlgos/python/tools/jetTools.py +++ b/PhysicsTools/PatAlgos/python/tools/jetTools.py @@ -549,7 +549,6 @@ def setupBTagging(process, jetSource, pfCandidates, explicitJTA, pvSource, svSou if hasattr(btag,btagDiscr): newDiscr = btagPrefix+btagDiscr+labelName+postfix #new discriminator name if hasattr(process, newDiscr): - print 'skipping %s as it has already been loaded in the process' % newDiscr #check that we did not create this producer before, if so skip pass elif hasattr(getattr(btag, btagDiscr), 'tagInfos'): addToProcessAndTask( diff --git a/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py b/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py index 48428b694792d..48137d475b649 100644 --- a/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py +++ b/PhysicsTools/SelectorUtils/python/tools/vid_id_tools.py @@ -177,7 +177,7 @@ def switchOnVIDPhotonIdProducer(process, dataFormat, task=None): else: raise Exception('InvalidVIDDataFormat', 'The requested data format is different from AOD or MiniAOD') # - sys.stderr.write('Added \'egmPhotonIDs\' to process definition (%s format)!\n' % dataFormatString) +# sys.stderr.write('Added \'egmPhotonIDs\' to process definition (%s format)!\n' % dataFormatString) def setupVIDPhotonSelection(process,cutflow,patProducer=None,addUserData=True,task=None): if not hasattr(process,'egmPhotonIDs'): From 9961a4462d4399caa9df478cefe1f6b48cc37d50 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 16 May 2017 15:09:27 +0200 Subject: [PATCH 2/3] revert --- L1Trigger/L1TGlobal/python/hackConditions_cff.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/L1Trigger/L1TGlobal/python/hackConditions_cff.py b/L1Trigger/L1TGlobal/python/hackConditions_cff.py index ba9ea6fc7672d..95bfd3228af4e 100644 --- a/L1Trigger/L1TGlobal/python/hackConditions_cff.py +++ b/L1Trigger/L1TGlobal/python/hackConditions_cff.py @@ -30,7 +30,7 @@ # Stage-2 Trigger # if stage2L1Trigger.isChosen(): - from L1Trigger.L1TGlobal.GlobalParameters_cff import * + from L1Trigger.L1TGlobal.StableParameters_cff import * # from L1Trigger.L1TGlobal.GlobalParameters_cff import * from L1Trigger.L1TGlobal.PrescalesVetos_cff import * # from L1Trigger.L1TGlobal.TriggerMenu_cff import * From 8041c0205afc23968131ee14d11a45fba782fe6f Mon Sep 17 00:00:00 2001 From: David Date: Tue, 16 May 2017 15:15:14 +0200 Subject: [PATCH 3/3] remove seemingly incorrect comment --- L1Trigger/L1TGlobal/python/StableParameters_cff.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/L1Trigger/L1TGlobal/python/StableParameters_cff.py b/L1Trigger/L1TGlobal/python/StableParameters_cff.py index 3018c985605ee..31a9ef7199dfa 100644 --- a/L1Trigger/L1TGlobal/python/StableParameters_cff.py +++ b/L1Trigger/L1TGlobal/python/StableParameters_cff.py @@ -5,7 +5,8 @@ import sys import FWCore.ParameterSet.Config as cms -print >> sys.stderr, 'L1Trigger/L1TGlobal/python/StableParameters_cff.py is deprecated, please use GlobalParameters_cff.py instead.' +#seems this is not the case +#print >> sys.stderr, 'L1Trigger/L1TGlobal/python/StableParameters_cff.py is deprecated, please use GlobalParameters_cff.py instead.' StableParametersRcdSource = cms.ESSource("EmptyESSource", recordName = cms.string('L1TGlobalParametersRcd'),