Merge pull request #17654 from davidlange6/port17635

Configuration/DataProcessing changes for 2017 scenarios
cms-sw · Feb 28, 2017 · 3c11244 · 3c11244
2 parents d5fdb16 + 3353c99
commit 3c11244
Show file tree

Hide file tree

Showing 16 changed files with 443 additions and 16 deletions.
diff --git a/Configuration/DataProcessing/python/Impl/cosmicsEra_Run2_2017.py b/Configuration/DataProcessing/python/Impl/cosmicsEra_Run2_2017.py
@@ -0,0 +1,25 @@
+#!/usr/bin/env python
+"""
+_cosmicsEra_Run2_2017_
+
+Scenario supporting cosmic data taking
+
+"""
+
+import os
+import sys
+
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+from Configuration.DataProcessing.Impl.cosmics import cosmics
+
+class cosmicsEra_Run2_2017(cosmics):
+    def __init__(self):
+        cosmics.__init__(self)
+        self.eras = Run2_2017
+    """
+    _cosmicsEra_Run2_2017_
+
+    Implement configuration building for data processing for cosmic
+    data taking in Run2
+
+    """
diff --git a/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py b/Configuration/DataProcessing/python/Impl/hcalnzsEra_Run2_2017.py
@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+"""
+_hcalnzsEra_Run2_2017_
+
+Scenario supporting proton collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Impl.hcalnzs import hcalnzs
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+
+class hcalnzsEra_Run2_2017(hcalnzs):
+    def __init__(self):
+        hcalnzs.__init__(self)
+        self.recoSeq=':reconstruction_HcalNZS'
+        self.cbSc='pp'
+        self.eras = Run2_2017
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+    """
+    _hcalnzsEra_Run2_2017_
+
+    Implement configuration building for data processing for proton
+    collision data taking
+
+    """
diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+"""
+_ppEra_Run2_2017_
+
+Scenario supporting proton collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run2_2017_cff import Run2_2017
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run2_2017(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.eras=Run2_2017
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+    """
+    _ppEra_Run2_2017_
+
+    Implement configuration building for data processing for proton
+    collision data taking for Run2
+
+    """
diff --git a/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py b/Configuration/DataProcessing/python/Impl/ppEra_Run2_2017_trackingLowPU.py
@@ -0,0 +1,33 @@
+#!/usr/bin/env python
+"""
+_ppEra_Run2_2017_trackingLowPU_
+
+Scenario supporting proton collisions
+
+"""
+
+import os
+import sys
+
+from Configuration.DataProcessing.Reco import Reco
+import FWCore.ParameterSet.Config as cms
+from Configuration.Eras.Era_Run2_2017_trackingLowPU_cff import Run2_2017_trackingLowPU
+
+from Configuration.DataProcessing.Impl.pp import pp
+
+class ppEra_Run2_2017_trackingLowPU(pp):
+    def __init__(self):
+        pp.__init__(self)
+        self.recoSeq=''
+        self.cbSc='pp'
+        self.eras=Run2_2017_trackingLowPU
+        self.promptCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+        self.expressCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+        self.visCustoms += [ 'Configuration/DataProcessing/RecoTLR.customisePostEra_Run2_2017' ]
+    """
+    _ppEra_Run2_2017_trackingLowPU_
+
+    Implement configuration building for data processing for proton
+    collision data taking for Run2
+
+    """
diff --git a/Configuration/DataProcessing/python/RecoTLR.py b/Configuration/DataProcessing/python/RecoTLR.py
@@ -43,6 +43,10 @@ def customisePostEra_Run2_2016(process):
     _hcalCustoms25ns(process)
     return process
 
+def customisePostEra_Run2_2017(process):
+    _hcalCustoms25ns(process)
+    return process
+
 
 ##############################################################################
 def customisePPData(process):

diff --git a/Configuration/DataProcessing/test/RunAlcaHarvesting.py b/Configuration/DataProcessing/test/RunAlcaHarvesting.py
@@ -9,6 +9,7 @@
 
 import sys
 import getopt
+import pickle
 
 from Configuration.DataProcessing.GetScenario import getScenario
 
@@ -76,9 +77,24 @@ def __call__(self):
         process.source.fileNames.append(self.inputLFN)
 
 
+        pklFile = open("RunAlcaHarvestingCfg.pkl", "w")
         psetFile = open("RunAlcaHarvestingCfg.py", "w")
-        psetFile.write(process.dumpPython())
-        psetFile.close()
+        try:
+            pickle.dump(process, pklFile)
+            psetFile.write("import FWCore.ParameterSet.Config as cms\n")
+            psetFile.write("import pickle\n")
+            psetFile.write("handle = open('RunAlcaHarvestingCfg.pkl')\n")
+            psetFile.write("process = pickle.load(handle)\n")
+            psetFile.write("handle.close()\n")
+            psetFile.close()
+        except Exception as ex:
+            print("Error writing out PSet:")
+            print(traceback.format_exc())
+            raise ex
+        finally:
+            psetFile.close()
+            pklFile.close()
+
         cmsRun = "cmsRun -j FrameworkJobReport.xml RunAlcaHarvestingCfg.py"
         print "Now do:\n%s" % cmsRun
 

diff --git a/Configuration/DataProcessing/test/RunAlcaSkimming.py b/Configuration/DataProcessing/test/RunAlcaSkimming.py
@@ -9,6 +9,7 @@
 
 import sys
 import getopt
+import pickle
 
 from Configuration.DataProcessing.GetScenario import getScenario
 
@@ -66,9 +67,24 @@ def __call__(self):
 
         process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) )
 
+        pklFile = open("RunAlcaSkimmingCfg.pkl", "w")
         psetFile = open("RunAlcaSkimmingCfg.py", "w")
-        psetFile.write(process.dumpPython())
-        psetFile.close()
+        try:
+            pickle.dump(process, pklFile)
+            psetFile.write("import FWCore.ParameterSet.Config as cms\n")
+            psetFile.write("import pickle\n")
+            psetFile.write("handle = open('RunAlcaSkimmingCfg.pkl')\n")
+            psetFile.write("process = pickle.load(handle)\n")
+            psetFile.write("handle.close()\n")
+            psetFile.close()
+        except Exception as ex:
+            print("Error writing out PSet:")
+            print(traceback.format_exc())
+            raise ex
+        finally:
+            psetFile.close()
+            pklFile.close()
+
         cmsRun = "cmsRun -e RunAlcaSkimmingCfg.py"
         print "Now do:\n%s" % cmsRun
 

diff --git a/Configuration/DataProcessing/test/RunDQMHarvesting.py b/Configuration/DataProcessing/test/RunDQMHarvesting.py
@@ -9,6 +9,7 @@
 
 import sys
 import getopt
+import pickle
 
 from Configuration.DataProcessing.GetScenario import getScenario
 
@@ -72,9 +73,24 @@ def __call__(self):
         process.source.fileNames.append(self.inputLFN)
 
 
+        pklFile = open("RunDQMHarvestingCfg.pkl", "w")
         psetFile = open("RunDQMHarvestingCfg.py", "w")
-        psetFile.write(process.dumpPython())
-        psetFile.close()
+        try:
+            pickle.dump(process, pklFile)
+            psetFile.write("import FWCore.ParameterSet.Config as cms\n")
+            psetFile.write("import pickle\n")
+            psetFile.write("handle = open('RunDQMHarvestingCfg.pkl')\n")
+            psetFile.write("process = pickle.load(handle)\n")
+            psetFile.write("handle.close()\n")
+            psetFile.close()
+        except Exception as ex:
+            print("Error writing out PSet:")
+            print(traceback.format_exc())
+            raise ex
+        finally:
+            psetFile.close()
+            pklFile.close()
+
         cmsRun = "cmsRun -j FrameworkJobReport.xml RunDQMHarvestingCfg.py"
         print "Now do:\n%s" % cmsRun
 

diff --git a/Configuration/DataProcessing/test/RunExpressProcessing.py b/Configuration/DataProcessing/test/RunExpressProcessing.py
@@ -10,6 +10,7 @@
 import sys
 import getopt
 import traceback
+import pickle
 
 from Configuration.DataProcessing.GetScenario import getScenario
 
@@ -105,9 +106,24 @@ def __call__(self):
 
         process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) )
 
+        pklFile = open("RunExpressProcessingCfg.pkl", "w")
         psetFile = open("RunExpressProcessingCfg.py", "w")
-        psetFile.write(process.dumpPython())
-        psetFile.close()
+        try:
+            pickle.dump(process, pklFile)
+            psetFile.write("import FWCore.ParameterSet.Config as cms\n")
+            psetFile.write("import pickle\n")
+            psetFile.write("handle = open('RunExpressProcessingCfg.pkl')\n")
+            psetFile.write("process = pickle.load(handle)\n")
+            psetFile.write("handle.close()\n")
+            psetFile.close()
+        except Exception as ex:
+            print("Error writing out PSet:")
+            print(traceback.format_exc())
+            raise ex
+        finally:
+            psetFile.close()
+            pklFile.close()
+
         cmsRun = "cmsRun -e RunExpressProcessingCfg.py"
         print "Now do:\n%s" % cmsRun
 

diff --git a/Configuration/DataProcessing/test/RunPromptReco.py b/Configuration/DataProcessing/test/RunPromptReco.py
@@ -10,6 +10,7 @@
 import sys
 import getopt
 import traceback
+import pickle
 
 from Configuration.DataProcessing.GetScenario import getScenario
 
@@ -115,9 +116,24 @@ def __call__(self):
 
         process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) )
 
+        pklFile = open("RunPromptRecoCfg.pkl", "w")
         psetFile = open("RunPromptRecoCfg.py", "w")
-        psetFile.write(process.dumpPython())
-        psetFile.close()
+        try:
+            pickle.dump(process, pklFile)
+            psetFile.write("import FWCore.ParameterSet.Config as cms\n")
+            psetFile.write("import pickle\n")
+            psetFile.write("handle = open('RunPromptRecoCfg.pkl')\n")
+            psetFile.write("process = pickle.load(handle)\n")
+            psetFile.write("handle.close()\n")
+            psetFile.close()
+        except Exception as ex:
+            print("Error writing out PSet:")
+            print(traceback.format_exc())
+            raise ex
+        finally:
+            psetFile.close()
+            pklFile.close()
+
         cmsRun = "cmsRun -e RunPromptRecoCfg.py"
         print "Now do:\n%s" % cmsRun
 

diff --git a/Configuration/DataProcessing/test/RunVisualizationProcessing.py b/Configuration/DataProcessing/test/RunVisualizationProcessing.py
@@ -9,6 +9,7 @@
 
 import sys
 import getopt
+import pickle
 
 from Configuration.DataProcessing.GetScenario import getScenario
 
@@ -108,9 +109,24 @@ def __call__(self):
 
         process.maxEvents = cms.untracked.PSet( input = cms.untracked.int32(10) )
 
+        pklFile = open("RunVisualizationProcessingCfg.pkl", "w")
         psetFile = open("RunVisualizationProcessingCfg.py", "w")
-        psetFile.write(process.dumpPython())
-        psetFile.close()
+        try:
+            pickle.dump(process, pklFile)
+            psetFile.write("import FWCore.ParameterSet.Config as cms\n")
+            psetFile.write("import pickle\n")
+            psetFile.write("handle = open('RunVisualizationProcessingCfg.pkl')\n")
+            psetFile.write("process = pickle.load(handle)\n")
+            psetFile.write("handle.close()\n")
+            psetFile.close()
+        except Exception as ex:
+            print("Error writing out PSet:")
+            print(traceback.format_exc())
+            raise ex
+        finally:
+            psetFile.close()
+            pklFile.close()
+
         cmsRun = "cmsRun -e RunVisualizationProcessingCfg.py"
         print "Now do:\n%s" % cmsRun