Merge pull request #1855 from Dr15Jones/excludeModulesWhichDependOnTk…

…DetMapFromThreadedRunning

Multithreading customise -- Exclude mouldes which depend on TkDetMap from threaded running

FWCore/Concurrency/python/dropNonMTSafe.py

@@ -1,10 +1,23 @@
 import FWCore.ParameterSet.Config as cms
 
+def _dropFromPaths(process,name):
+  if hasattr(process,name):
+    m = getattr(process,name)
+    for p in process.paths.itervalues():
+      p.remove(m)
+    delattr(process,name)
+
 def dropNonMTSafe(process):
   if hasattr(process, "DTDataIntegrityTask"): del process.DTDataIntegrityTask
   if hasattr(process, "FastTimerService"): del process.FastTimerService
   if hasattr(process, "SiStripDetInfoFileReader"): del process.SiStripDetInfoFileReader
   if hasattr(process, "TkDetMap"): del process.TkDetMap
+  #drop items dependent on TkDetMap
+  _dropFromPaths(process,"siStripFEDMonitor")
+  _dropFromPaths(process,"SiStripMonitorDigi")
+  _dropFromPaths(process,"SiStripMonitorCluster")
+  _dropFromPaths(process,"SiStripMonitorTrack_ckf")
+
   process.options = cms.untracked.PSet(numberOfThreads = cms.untracked.uint32(8),
                                        numberOfStreams = cms.untracked.uint32(0))
   return process