Merge pull request #18758 from davidlange6/92xClean

92x cleanup of printouts

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"),

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 *
 
 ############################################################
 

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 *

L1Trigger/Configuration/python/L1TRawToDigi_cff.py

@@ -71,23 +71,20 @@ 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);
 
 #
 # 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)
 
 #
 # 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)

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,11 +38,10 @@
 #
 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_2017_v1_5_cfi import *    
+
 
     # What about CaloConfig?  Related:  How will we switch PP/HH?
     #

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

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'),

L1Trigger/L1TGlobal/python/hackConditions_cff.py

@@ -30,7 +30,6 @@
 # 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.PrescalesVetos_cff import *

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)

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 *

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 *

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(

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'):