Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remote hot line output #10150

Merged
merged 3 commits into from Jul 11, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions Configuration/Applications/python/ConfigBuilder.py
Expand Up @@ -2191,6 +2191,14 @@ def prepare(self, doChecking = False):
self.process.load(module)
self.pythonCfgCode += ("process.load('"+module+"')\n")

#and clean the unscheduled stuff
self.pythonCfgCode+="from FWCore.ParameterSet.Utilities import cleanUnscheduled\n"
self.pythonCfgCode+="process=cleanUnscheduled(process)\n"

from FWCore.ParameterSet.Utilities import cleanUnscheduled
self.process=cleanUnscheduled(self.process)


self.pythonCfgCode += self.addCustomise(1)


Expand Down
2 changes: 1 addition & 1 deletion Configuration/EventContent/python/AlCaRecoOutput_cff.py
Expand Up @@ -164,7 +164,7 @@
ALCARECOEventContent.outputCommands.extend(OutALCARECODtCalib_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOSiStripPCLHistos_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOLumiPixels_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHotline.outputCommands)
#ALCARECOEventContent.outputCommands.extend(OutALCARECOHotline.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOTkAlMinBiasHI_noDrop.outputCommands)
ALCARECOEventContent.outputCommands.extend(OutALCARECOHcalCalMinBiasHI_noDrop.outputCommands)

Expand Down
10 changes: 8 additions & 2 deletions FWCore/ParameterSet/python/Utilities.py
Expand Up @@ -101,6 +101,11 @@ def convertToUnscheduled(proc):
proc.options = cms.untracked.PSet()
proc.options.allowUnscheduled = cms.untracked.bool(True)

proc=cleanUnscheduled(proc)
return proc

def cleanUnscheduled(proc):
import FWCore.ParameterSet.Config as cms
l = proc.paths
droppedPaths =[]
#have to get them now since switching them after the
Expand Down Expand Up @@ -218,7 +223,7 @@ def getQualifiedModule(name,proc):
# If there is a schedule then it needs to point at
# the new Path objects
if proc.schedule:
proc.schedule = cms.Schedule([getattr(proc,p) for p in pathNamesInScheduled])
proc._Process__schedule = None
return proc

if __name__ == "__main__":
Expand Down Expand Up @@ -355,6 +360,7 @@ def testWithSchedule(self):
self.assertEqual(process.p2.dumpPython(None),'cms.Path()\n')
self.assertEqual(process.p3.dumpPython(None),'cms.Path(process.f1)\n')
self.assertEqual(process.p4.dumpPython(None),'cms.Path(process.f2+process.f1)\n')
self.assertEqual([p for p in process.schedule],[process.p1,process.p4,process.p2,process.p3])
# there is no longer a schedule.
# self.assertEqual([p for p in process.schedule],[process.p1,process.p4,process.p2,process.p3])

unittest.main()
16 changes: 1 addition & 15 deletions PhysicsTools/PatAlgos/python/slimming/metFilterPaths_cff.py
Expand Up @@ -25,21 +25,7 @@
# and the summary
Flag_METFilters = cms.Path(metFilters)


def miniAOD_insertMETFiltersInSchedule(process):
All_METFilters = [ 'Flag_HBHENoiseFilter', 'Flag_CSCTightHaloFilter', 'Flag_hcalLaserEventFilter', 'Flag_EcalDeadCellTriggerPrimitiveFilter', 'Flag_goodVertices', 'Flag_trackingFailureFilter', 'Flag_eeBadScFilter', 'Flag_ecalLaserCorrFilter', 'Flag_trkPOGFilters', 'Flag_trkPOG_manystripclus53X', 'Flag_trkPOG_toomanystripclus53X', 'Flag_trkPOG_logErrorTooManyClusters', 'Flag_METFilters']
if hasattr(process,'schedule'):
found = -1
for i,p in enumerate(process.schedule):
if isinstance(p, cms.EndPath):
found = i
break
for pname in All_METFilters:
path = getattr(process,pname)
if not isinstance(path, cms.Path): raise RuntimeError, "Path %s is not a cms.Path?" % pathname
if found == -1: process.schedule.append(path)
else: process.schedule.insert(found, path)


def miniAOD_customizeMETFiltersFastSim(process):
"""Replace some MET filters that don't work in FastSim with trivial bools"""
for X in 'CSCTightHaloFilter', 'HBHENoiseFilter', 'HBHENoiseFilterResultProducer':
Expand Down
3 changes: 0 additions & 3 deletions PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py
Expand Up @@ -228,9 +228,6 @@ def miniAOD_customizeCommon(process):
process.slimmedMETsPuppi.type1Uncertainties = cms.InputTag("patPFMetT1") # only central value for now
del process.slimmedMETsPuppi.type1p2Uncertainties # not available

from PhysicsTools.PatAlgos.slimming.metFilterPaths_cff import miniAOD_insertMETFiltersInSchedule
miniAOD_insertMETFiltersInSchedule(process)

def miniAOD_customizeMC(process):
process.muonMatch.matched = "prunedGenParticles"
process.electronMatch.matched = "prunedGenParticles"
Expand Down