Merge pull request #10148 from davidlange6/unsch_75x_150711

Fix met filters in pat

Configuration/Applications/python/ConfigBuilder.py

@@ -2203,6 +2203,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)
 
 

FWCore/ParameterSet/python/Utilities.py

@@ -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
@@ -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__":
@@ -362,6 +367,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()

PhysicsTools/PatAlgos/python/slimming/miniAOD_tools.py

@@ -270,7 +270,6 @@ def miniAOD_customizeCommon(process):
     del process.slimmedMETsPuppi.caloMET
 
 
-
 def miniAOD_customizeMC(process):
     process.muonMatch.matched = "prunedGenParticles"
     process.electronMatch.matched = "prunedGenParticles"