Merge branch 'dev_102x' into 102x

cms-jet · Apr 29, 2020 · 39b3c31 · 39b3c31
2 parents cf5e8ed + 6c16e5e
commit 39b3c31
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 25 deletions.
diff --git a/plugins/BuildFile.xml b/plugins/BuildFile.xml
@@ -7,7 +7,7 @@
   <use name="CommonTools/Utils"/>
   <use name="RecoBTag/FeatureTools"/>
   <use name="RecoJets/JetAlgorithms"/>
-  <use name="PhysicsTools/Pancakes"/>
+  <use name="PhysicsTools/NanoAODJMAR"/>
   <use name="TrackingTools/Records"/>
   <use name="roottmva"/>
   <use name="fastjet"/>

diff --git a/test/JMECustomNano102x_on_mini94x_2016_data_NANO.py b/test/JMECustomNano102x_on_mini94x_2016_data_NANO.py
@@ -1,7 +1,7 @@
 # Auto generated configuration file
-# using: 
-# Revision: 1.19 
-# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
+# using:
+# Revision: 1.19
+# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v
 # with command line options: JMECustomNano102x_on_mini94x_2016_data --data --eventcontent NANOAODSIM --datatier NANOAODSIM --conditions 102X_dataRun2_v13 --step NANO --era Run2_2016,run2_nanoAOD_94X2016 --customise_commands=process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) \n from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_Data; PrepJMECustomNanoAOD_Data(process)\n -n 100 --filein /store/data/Run2016C/JetHT/MINIAOD/17Jul2018-v1/20000/88F8898D-538E-E811-B51E-0090FAA57BE0.root --nThreads 2
 import FWCore.ParameterSet.Config as cms
 
@@ -77,7 +77,7 @@
 # customisation of the process.
 
 # Automatic addition of the customisation function from PhysicsTools.NanoAOD.nano_cff
-from PhysicsTools.NanoAOD.nano_cff import nanoAOD_customizeData 
+from PhysicsTools.NanoAOD.nano_cff import nanoAOD_customizeData
 
 #call to customisation function nanoAOD_customizeData imported from PhysicsTools.NanoAOD.nano_cff
 process = nanoAOD_customizeData(process)
@@ -86,8 +86,9 @@
 
 # Customisation from command line
 
-process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) 
-from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_Data; PrepJMECustomNanoAOD_Data(process)
+process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False)))
+from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_Data
+process = PrepJMECustomNanoAOD_Data(process)
 
 # Add early deletion of temporary data products to reduce peak memory need
 from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete

diff --git a/test/JMECustomNano102x_on_mini94x_2016_mc_NANO.py b/test/JMECustomNano102x_on_mini94x_2016_mc_NANO.py
@@ -2,7 +2,7 @@
 # using: 
 # Revision: 1.19 
 # Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
-# with command line options: JMECustomNano102x_on_mini94x_2016_mc --mc --eventcontent NANOAODSIM --datatier NANOAODSIM --conditions 102X_mcRun2_asymptotic_v8 --step NANO --era Run2_2016,run2_nanoAOD_94X2016 --customise_commands=process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) \n from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_MC; PrepJMECustomNanoAOD_MC(process)\n -n 100 --filein /store/mc/RunIISummer16MiniAODv3/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_94X_mcRun2_asymptotic_v3-v2/120000/086BBC76-7AEA-E811-AA5A-6CC2173D9FB0.root --nThreads 2
+# with command line options: JMECustomNano102x_on_mini94x_2016_mc --mc --eventcontent NANOAODSIM --datatier NANOAODSIM --conditions 102X_mcRun2_asymptotic_v8 --step NANO --era Run2_2016,run2_nanoAOD_94X2016 --customise_commands=process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) --customise PhysicsTools/NanoAOD/custom_jme_cff.PrepJMECustomNanoAOD_MC -n 100 --filein /store/mc/RunIISummer16MiniAODv3/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_94X_mcRun2_asymptotic_v3-v2/120000/086BBC76-7AEA-E811-AA5A-6CC2173D9FB0.root --nThreads 2
 import FWCore.ParameterSet.Config as cms
 
 from Configuration.StandardSequences.Eras import eras
@@ -83,13 +83,17 @@
 #call to customisation function nanoAOD_customizeMC imported from PhysicsTools.NanoAOD.nano_cff
 process = nanoAOD_customizeMC(process)
 
+# Automatic addition of the customisation function from PhysicsTools.NanoAOD.custom_jme_cff
+from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_MC 
+
+#call to customisation function PrepJMECustomNanoAOD_MC imported from PhysicsTools.NanoAOD.custom_jme_cff
+process = PrepJMECustomNanoAOD_MC(process)
+
 # End of customisation functions
 
 # Customisation from command line
 
-process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) 
-from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_MC; PrepJMECustomNanoAOD_MC(process)
-
+process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False)))
 # Add early deletion of temporary data products to reduce peak memory need
 from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete
 process = customiseEarlyDelete(process)

diff --git a/test/JMECustomplusJMARNano102x_on_mini94x_2016_data_NANO.py b/test/JMECustomplusJMARNano102x_on_mini94x_2016_data_NANO.py
@@ -1,7 +1,7 @@
 # Auto generated configuration file
-# using: 
-# Revision: 1.19 
-# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
+# using:
+# Revision: 1.19
+# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v
 # with command line options: JMECustomplustJMARNano102x_on_mini94x_2016_data --data --eventcontent NANOAODSIM --datatier NANOAODSIM --conditions 102X_dataRun2_v13 --step NANO --era Run2_2016,run2_nanoAOD_94X2016 --customise_commands=process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) \n from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_Data; PrepJMECustomNanoAOD_Data(process)\n -n 100 --filein /store/data/Run2016C/JetHT/MINIAOD/17Jul2018-v1/20000/88F8898D-538E-E811-B51E-0090FAA57BE0.root --nThreads 2 --customise PhysicsTools/NanoAODJMAR/nano_jmar_cff.JMARnano_customizeData
 import FWCore.ParameterSet.Config as cms
 
@@ -77,13 +77,13 @@
 # customisation of the process.
 
 # Automatic addition of the customisation function from PhysicsTools.NanoAOD.nano_cff
-from PhysicsTools.NanoAOD.nano_cff import nanoAOD_customizeData 
+from PhysicsTools.NanoAOD.nano_cff import nanoAOD_customizeData
 
 #call to customisation function nanoAOD_customizeData imported from PhysicsTools.NanoAOD.nano_cff
 process = nanoAOD_customizeData(process)
 
 # Automatic addition of the customisation function from PhysicsTools.NanoAODJMAR.nano_jmar_cff
-from PhysicsTools.NanoAODJMAR.nano_jmar_cff import JMARnano_customizeData 
+from PhysicsTools.NanoAODJMAR.nano_jmar_cff import JMARnano_customizeData
 
 #call to customisation function JMARnano_customizeData imported from PhysicsTools.NanoAODJMAR.nano_jmar_cff
 process = JMARnano_customizeData(process)
@@ -92,8 +92,9 @@
 
 # Customisation from command line
 
-process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) 
-from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_Data; PrepJMECustomNanoAOD_Data(process)
+process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False)))
+from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_Data
+process = PrepJMECustomNanoAOD_Data(process)
 
 # Add early deletion of temporary data products to reduce peak memory need
 from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete

diff --git a/test/JMECustomplusJMARnano102x_on_mini94x_2016_mc_NANO.py b/test/JMECustomplusJMARnano102x_on_mini94x_2016_mc_NANO.py
@@ -1,7 +1,7 @@
 # Auto generated configuration file
-# using: 
-# Revision: 1.19 
-# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v 
+# using:
+# Revision: 1.19
+# Source: /local/reps/CMSSW/CMSSW/Configuration/Applications/python/ConfigBuilder.py,v
 # with command line options: JMECustomNano_plusJMARnano102x_on_mini94x_2016_mc --mc --eventcontent NANOAODSIM --datatier NANOAODSIM --conditions 102X_mcRun2_asymptotic_v8 --step NANO --era Run2_2016,run2_nanoAOD_94X2016 --customise_commands=process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) \n from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_MC; PrepJMECustomNanoAOD_MC(process)\n -n 100 --filein /store/mc/RunIISummer16MiniAODv3/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_94X_mcRun2_asymptotic_v3-v2/120000/086BBC76-7AEA-E811-AA5A-6CC2173D9FB0.root --nThreads 2 --customise PhysicsTools/NanoAODJMAR/nano_jmar_cff.JMARnano_customizeMC
 import FWCore.ParameterSet.Config as cms
 
@@ -78,13 +78,13 @@
 # customisation of the process.
 
 # Automatic addition of the customisation function from PhysicsTools.NanoAOD.nano_cff
-from PhysicsTools.NanoAOD.nano_cff import nanoAOD_customizeMC 
+from PhysicsTools.NanoAOD.nano_cff import nanoAOD_customizeMC
 
 #call to customisation function nanoAOD_customizeMC imported from PhysicsTools.NanoAOD.nano_cff
 process = nanoAOD_customizeMC(process)
 
 # Automatic addition of the customisation function from PhysicsTools.NanoAODJMAR.nano_jmar_cff
-from PhysicsTools.NanoAODJMAR.nano_jmar_cff import JMARnano_customizeMC 
+from PhysicsTools.NanoAODJMAR.nano_jmar_cff import JMARnano_customizeMC
 
 #call to customisation function JMARnano_customizeMC imported from PhysicsTools.NanoAODJMAR.nano_jmar_cff
 process = JMARnano_customizeMC(process)
@@ -93,8 +93,9 @@
 
 # Customisation from command line
 
-process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False))) 
-from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_MC; PrepJMECustomNanoAOD_MC(process)
+process.add_(cms.Service('InitRootHandlers', EnableIMT = cms.untracked.bool(False)))
+from PhysicsTools.NanoAOD.custom_jme_cff import PrepJMECustomNanoAOD_MC
+process = PrepJMECustomNanoAOD_MC(process)
 
 # Add early deletion of temporary data products to reduce peak memory need
 from Configuration.StandardSequences.earlyDeleteSettings_cff import customiseEarlyDelete