Switch to standard customise via ConfigBuilder for Configuration/Data…

…Processing
cms-sw · Jun 1, 2015 · 38ef06a · 38ef06a
1 parent 100d06a
commit 38ef06a
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 41 deletions.
diff --git a/Configuration/Applications/python/ConfigBuilder.py b/Configuration/Applications/python/ConfigBuilder.py
@@ -2181,9 +2181,11 @@ def prepare(self, doChecking = False):
 		#this is not supporting the blacklist at this point since I do not understand it
 		self.pythonCfgCode+="#do not add changes to your config after this point (unless you know what you are doing)\n"
 		self.pythonCfgCode+="from FWCore.ParameterSet.Utilities import convertToUnscheduled\n"
-
 		self.pythonCfgCode+="process=convertToUnscheduled(process)\n"
 
+		from FWCore.ParameterSet.Utilities import convertToUnscheduled
+		self.process=convertToUnscheduled(self.process)
+
 		#now add the unscheduled stuff
 		for module in self.importsUnsch:
 			self.process.load(module)

diff --git a/Configuration/DataProcessing/python/Impl/cosmics.py b/Configuration/DataProcessing/python/Impl/cosmics.py
@@ -10,7 +10,6 @@
 import sys
 
 from Configuration.DataProcessing.Reco import Reco
-from Configuration.DataProcessing.RecoTLR import customiseCosmicData
 
 class cosmics(Reco):
     """
@@ -31,9 +30,14 @@ def promptReco(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']= ['@allForPromptCosmics']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseCosmicData']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseCosmicData')
+
         process = Reco.promptReco(self,globalTag, **args)
 
-        customiseCosmicData(process)  
         return process
 
 
@@ -47,9 +51,13 @@ def expressProcessing(self, globalTag, **args):
 
         if not 'skims' in args:
             args['skims']= ['@allForExpressCosmics']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseCosmicData']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseCosmicData')
         process = Reco.expressProcessing(self,globalTag, **args)
 
-        customiseCosmicData(process)  
         return process
 
     def visualizationProcessing(self, globalTag, **args):
@@ -60,9 +68,12 @@ def visualizationProcessing(self, globalTag, **args):
 
         """
 
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseCosmicData']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseCosmicData')
         process = Reco.visualizationProcessing(self,globalTag, **args)
 
-        customiseCosmicData(process)  
         process.reconstructionCosmics.remove(process.lumiProducer)
 
         return process

diff --git a/Configuration/DataProcessing/python/Impl/cosmicsRun2.py b/Configuration/DataProcessing/python/Impl/cosmicsRun2.py
@@ -10,7 +10,6 @@
 import sys
 
 from Configuration.DataProcessing.Reco import Reco
-from Configuration.DataProcessing.RecoTLR import customiseCosmicDataRun2
 
 class cosmicsRun2(Reco):
     def __init__(self):
@@ -34,9 +33,12 @@ def promptReco(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']= ['@allForPromptCosmics']
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseCosmicDataRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseCosmicDataRun2')
         process = Reco.promptReco(self,globalTag, **args)
 
-        customiseCosmicDataRun2(process)  
         return process
 
 
@@ -50,9 +52,12 @@ def expressProcessing(self, globalTag, **args):
 
         if not 'skims' in args:
             args['skims']= ['@allForExpressCosmics']
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseCosmicDataRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseCosmicDataRun2')
         process = Reco.expressProcessing(self,globalTag, **args)
 
-        customiseCosmicDataRun2(process)  
         return process
 
     def visualizationProcessing(self, globalTag, **args):
@@ -63,9 +68,12 @@ def visualizationProcessing(self, globalTag, **args):
 
         """
 
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseCosmicDataRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseCosmicDataRun2')
         process = Reco.visualizationProcessing(self,globalTag, **args)
 
-        customiseCosmicDataRun2(process)  
         process.reconstructionCosmics.remove(process.lumiProducer)
 
         return process

diff --git a/Configuration/DataProcessing/python/Impl/hcalnzs.py b/Configuration/DataProcessing/python/Impl/hcalnzs.py
@@ -10,7 +10,6 @@
 import sys
 
 from Configuration.DataProcessing.Impl.pp import pp
-from Configuration.DataProcessing.RecoTLR import customisePrompt
 
 class hcalnzs(pp):
     def __init__(self):

diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsRun2.py b/Configuration/DataProcessing/python/Impl/hcalnzsRun2.py
@@ -10,7 +10,6 @@
 import sys
 
 from Configuration.DataProcessing.Impl.pp import pp
-from Configuration.DataProcessing.RecoTLR import customisePromptRun2
 
 class hcalnzsRun2(pp):
     def __init__(self):
@@ -32,8 +31,12 @@ def promptReco(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['HcalCalMinBias']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customisePromptRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customisePromptRun2')
+
         process = pp.promptReco(self,globalTag,**args)
 
-        #add the former top level patches here
-        customisePromptRun2(process)
         return process
diff --git a/Configuration/DataProcessing/python/Impl/pp.py b/Configuration/DataProcessing/python/Impl/pp.py
@@ -11,7 +11,6 @@
 
 from Configuration.DataProcessing.Reco import Reco
 import FWCore.ParameterSet.Config as cms
-from Configuration.DataProcessing.RecoTLR import customisePrompt,customiseExpress
 
 class pp(Reco):
     """
@@ -32,11 +31,14 @@ def promptReco(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['@allForPrompt']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customisePrompt']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customisePrompt')
+
         process = Reco.promptReco(self,globalTag, **args)
 
-        #add the former top level patches here
-        customisePrompt(process)
-
         return process
 
 
@@ -49,10 +51,14 @@ def expressProcessing(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['@allForExpress']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseExpress']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseExpress')
+
         process = Reco.expressProcessing(self,globalTag, **args)
 
-        customiseExpress(process)
-
         return process
 
     def visualizationProcessing(self, globalTag, **args):
@@ -62,10 +68,14 @@ def visualizationProcessing(self, globalTag, **args):
         Proton collision data taking visualization processing
 
         """
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseExpress']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseExpress')
+
         process = Reco.visualizationProcessing(self,globalTag, **args)
 
-        customiseExpress(process)
-
         return process
 
     def alcaHarvesting(self, globalTag, datasetName, **args):

diff --git a/Configuration/DataProcessing/python/Impl/ppRun2.py b/Configuration/DataProcessing/python/Impl/ppRun2.py
@@ -11,7 +11,6 @@
 
 from Configuration.DataProcessing.Reco import Reco
 import FWCore.ParameterSet.Config as cms
-from Configuration.DataProcessing.RecoTLR import customisePromptRun2,customiseExpressRun2
 
 class ppRun2(Reco):
     def __init__(self):
@@ -35,11 +34,14 @@ def promptReco(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['@allForPrompt']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customisePromptRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customisePromptRun2')
+
         process = Reco.promptReco(self,globalTag, **args)
 
-        #add the former top level patches here
-        customisePromptRun2(process)
-
         return process
 
 
@@ -52,10 +54,14 @@ def expressProcessing(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['@allForExpress']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseExpressRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseExpressRun2')
+
         process = Reco.expressProcessing(self,globalTag, **args)
 
-        customiseExpressRun2(process)
-
         return process
 
     def visualizationProcessing(self, globalTag, **args):
@@ -65,10 +71,13 @@ def visualizationProcessing(self, globalTag, **args):
         Proton collision data taking visualization processing
 
         """
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseExpressRun2']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseExpressRun2')
+
         process = Reco.visualizationProcessing(self,globalTag, **args)
 
-        customiseExpressRun2(process)
-
         return process
 
     def alcaHarvesting(self, globalTag, datasetName, **args):

diff --git a/Configuration/DataProcessing/python/Impl/ppRun2B0T.py b/Configuration/DataProcessing/python/Impl/ppRun2B0T.py
@@ -11,7 +11,6 @@
 
 from Configuration.DataProcessing.Reco import Reco
 import FWCore.ParameterSet.Config as cms
-from Configuration.DataProcessing.RecoTLR import customisePromptRun2B0T,customiseExpressRun2B0T
 
 class ppRun2B0T(Reco):
     def __init__(self):
@@ -35,11 +34,14 @@ def promptReco(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['@allForPrompt']
+
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customisePromptRun2B0T']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customisePromptRun2B0T')
+
         process = Reco.promptReco(self,globalTag, **args)
 
-        #add the former top level patches here
-        customisePromptRun2B0T(process)
-
         return process
 
 
@@ -52,10 +54,14 @@ def expressProcessing(self, globalTag, **args):
         """
         if not 'skims' in args:
             args['skims']=['@allForExpress']
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseExpressRun2B0T']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseExpressRun2B0T')
+
+
         process = Reco.expressProcessing(self,globalTag, **args)
 
-        customiseExpressRun2B0T(process)
-
         return process
 
     def visualizationProcessing(self, globalTag, **args):
@@ -65,10 +71,13 @@ def visualizationProcessing(self, globalTag, **args):
         Proton collision data taking visualization processing
 
         """
+        if not 'customs' in args:
+            args['customs']=['Configuration/DataProcessing/RecoTLR.customiseExpressRun2B0T']
+        else:
+            args['customs'].append('Configuration/DataProcessing/RecoTLR.customiseExpressRun2B0T')
+
         process = Reco.visualizationProcessing(self,globalTag, **args)
 
-        customiseExpressRun2B0T(process)
-
         return process
 
     def alcaHarvesting(self, globalTag, datasetName, **args):

diff --git a/Configuration/DataProcessing/python/Reco.py b/Configuration/DataProcessing/python/Reco.py
@@ -49,6 +49,9 @@ def promptReco(self, globalTag, **args):
                     options.runUnscheduled=True
 
 
+        if 'customs' in args:
+            options.customisation_file=args['customs']
+
         options.step = 'RAW2DIGI,L1Reco,RECO'+self.recoSeq+step+miniAODStep+',DQM'+dqmStep+',ENDJOB'
 
 
@@ -94,6 +97,10 @@ def expressProcessing(self, globalTag, **args):
         if 'inputSource' in args:
             options.filetype = args['inputSource']
         process = cms.Process('RECO')
+
+        if 'customs' in args:
+            options.customisation_file=args['customs']
+
         cb = ConfigBuilder(options, process = process, with_output = True, with_input = True)
 
         cb.prepare()
@@ -135,6 +142,10 @@ def visualizationProcessing(self, globalTag, **args):
         print "Using %s source"%options.filetype            
 
         process = cms.Process('RECO')
+
+        if 'customs' in args:
+            options.customisation_file=args['customs']
+
         cb = ConfigBuilder(options, process = process, with_output = True, with_input = True)
 
         cb.prepare()
@@ -179,6 +190,9 @@ def alcaSkim(self, skims, **args):
             options.conditions += ','+args['globalTagConnect']
 
         options.triggerResultsProcess = 'RECO'
+
+        if 'customs' in args:
+            options.customisation_file=args['customs']
 
         process = cms.Process('ALCA')
         cb = ConfigBuilder(options, process = process)
@@ -215,6 +229,10 @@ def dqmHarvesting(self, datasetName, runNumber, globalTag, **args):
 
         process = cms.Process("HARVESTING")
         process.source = dqmIOSource(args)
+
+        if 'customs' in args:
+            options.customisation_file=args['customs']
+
         configBuilder = ConfigBuilder(options, process = process)
         configBuilder.prepare()
 
@@ -247,6 +265,10 @@ def alcaHarvesting(self, globalTag, datasetName, **args):
 
         process = cms.Process("ALCAHARVEST")
         process.source = cms.Source("PoolSource")
+
+        if 'customs' in args:
+            options.customisation_file=args['customs']
+
         configBuilder = ConfigBuilder(options, process = process)
         configBuilder.prepare()
 
@@ -274,6 +296,10 @@ def skimming(self, skims, globalTag,**options):
         options.conditions = gtNameAndConnect(globalTag, args)
         process = cms.Process("SKIM")
         process.source = cms.Source("PoolSource")
+
+        if 'customs' in args:
+            options.customisation_file=args['customs']
+
         configBuilder = ConfigBuilder(options, process = process)
         configBuilder.prepare()