From 7aa9d489ba0036da663e672d21a43ed9ab8f9739 Mon Sep 17 00:00:00 2001 From: matt-komm Date: Thu, 18 Oct 2018 16:15:30 +0100 Subject: [PATCH 01/14] fix nanoaod version --- test/runCMSSWTest.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/test/runCMSSWTest.sh b/test/runCMSSWTest.sh index 7551ce9..70fb594 100755 --- a/test/runCMSSWTest.sh +++ b/test/runCMSSWTest.sh @@ -1,3 +1,19 @@ +function cms-merge-commit() +{ + local github_user="${1}" + local topic_branch="${2}" + local commit_hash="${3}" + echo "-----> Merging commit ${commit_hash} on branch ${topic_branch} from ${github_user}" + + git remote add -t "${topic_branch}" "${github_user}" "https://github.com/${github_user}/cmssw.git" + git fetch --no-tags "${github_user}" "${topic_branch}:refs/remotes/${github_user}/${topic_branch}" || { echo "Could not fetch branch ${topic_branch} from ${github_user}"; exit 1; } + local current_branch="$(git rev-parse --abbrev-ref HEAD)" + local merge_base="$(git merge-base ${commit_hash} ${current_branch})" + git cms-sparse-checkout "${merge_base}" "${commit_hash}" + git read-tree -mu HEAD + git merge --no-ff -m "Merged ${commit_hash} on branch ${topic_branch} from ${github_user} into ${current_branch}" "${commit_hash}" || { echo "Could not merge ${commit_hash} on branch ${topic_branch} from ${github_user} into ${current_branch}"; exit 1; } +} + function run_test() { #check siteconfig for GT @@ -14,7 +30,8 @@ function run_test() eval `scramv1 runtime -sh` || return 1 git config --global user.email "root.rooster@chicken.com" git config --global user.name "Root rooster" - git cms-merge-topic cms-nanoAOD:master || return 1 + git init + cms-merge-commit cms-nanoAOD master a348544b0d03cbf135953ce23c27ea2b4723327c mkdir NANOX rsync -r --stats /scripts/ NANOX/. || return 1 scram b || return 1 From 4101fdefd004c463335bf7bb30aefb84680346ab Mon Sep 17 00:00:00 2001 From: matt-komm Date: Thu, 18 Oct 2018 16:22:19 +0100 Subject: [PATCH 02/14] add cms-init --- test/runCMSSWTest.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/runCMSSWTest.sh b/test/runCMSSWTest.sh index 70fb594..6add436 100755 --- a/test/runCMSSWTest.sh +++ b/test/runCMSSWTest.sh @@ -6,12 +6,12 @@ function cms-merge-commit() echo "-----> Merging commit ${commit_hash} on branch ${topic_branch} from ${github_user}" git remote add -t "${topic_branch}" "${github_user}" "https://github.com/${github_user}/cmssw.git" - git fetch --no-tags "${github_user}" "${topic_branch}:refs/remotes/${github_user}/${topic_branch}" || { echo "Could not fetch branch ${topic_branch} from ${github_user}"; exit 1; } + git fetch --no-tags "${github_user}" "${topic_branch}:refs/remotes/${github_user}/${topic_branch}" || { echo "Could not fetch branch ${topic_branch} from ${github_user}"; return 1; } local current_branch="$(git rev-parse --abbrev-ref HEAD)" local merge_base="$(git merge-base ${commit_hash} ${current_branch})" - git cms-sparse-checkout "${merge_base}" "${commit_hash}" - git read-tree -mu HEAD - git merge --no-ff -m "Merged ${commit_hash} on branch ${topic_branch} from ${github_user} into ${current_branch}" "${commit_hash}" || { echo "Could not merge ${commit_hash} on branch ${topic_branch} from ${github_user} into ${current_branch}"; exit 1; } + git cms-sparse-checkout "${merge_base}" "${commit_hash}" || return 1 + git read-tree -mu HEAD || return 1 + git merge --no-ff -m "Merged ${commit_hash} on branch ${topic_branch} from ${github_user} into ${current_branch}" "${commit_hash}" || { echo "Could not merge ${commit_hash} on branch ${topic_branch} from ${github_user} into ${current_branch}"; return 1; } } function run_test() @@ -30,8 +30,9 @@ function run_test() eval `scramv1 runtime -sh` || return 1 git config --global user.email "root.rooster@chicken.com" git config --global user.name "Root rooster" - git init - cms-merge-commit cms-nanoAOD master a348544b0d03cbf135953ce23c27ea2b4723327c + git cms-init --upstream-only + cms-merge-commit cms-nanoAOD master a348544b0d03cbf135953ce23c27ea2b4723327c || return 1 + git cms-checkdeps -a || return 1 mkdir NANOX rsync -r --stats /scripts/ NANOX/. || return 1 scram b || return 1 From 9af03829a75c0f83f3a555f5530c24f298e9687a Mon Sep 17 00:00:00 2001 From: matt-komm Date: Thu, 18 Oct 2018 16:36:44 +0100 Subject: [PATCH 03/14] change commit --- test/runCMSSWTest.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/runCMSSWTest.sh b/test/runCMSSWTest.sh index 6add436..f7bed84 100755 --- a/test/runCMSSWTest.sh +++ b/test/runCMSSWTest.sh @@ -31,7 +31,7 @@ function run_test() git config --global user.email "root.rooster@chicken.com" git config --global user.name "Root rooster" git cms-init --upstream-only - cms-merge-commit cms-nanoAOD master a348544b0d03cbf135953ce23c27ea2b4723327c || return 1 + cms-merge-commit cms-nanoAOD master 113b023b291dd986e00df80a415f6c6549c077a0 || return 1 git cms-checkdeps -a || return 1 mkdir NANOX rsync -r --stats /scripts/ NANOX/. || return 1 From 0c7169fb30dd9e6a7ff4e01f0d67b45abb274ceb Mon Sep 17 00:00:00 2001 From: matt-komm Date: Thu, 18 Oct 2018 16:53:10 +0100 Subject: [PATCH 04/14] switch v --- test/runCMSSWTest.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/runCMSSWTest.sh b/test/runCMSSWTest.sh index f7bed84..b673677 100755 --- a/test/runCMSSWTest.sh +++ b/test/runCMSSWTest.sh @@ -25,13 +25,13 @@ function run_test() cd ~ source ~/.bashrc export SCRAM_ARCH=slc6_amd64_gcc630 || return 1 - scramv1 project CMSSW CMSSW_9_4_9 || return 1 - cd CMSSW_9_4_9/src || return 1 + scramv1 project CMSSW CMSSW_9_4_8 || return 1 + cd CMSSW_9_4_8/src || return 1 eval `scramv1 runtime -sh` || return 1 git config --global user.email "root.rooster@chicken.com" git config --global user.name "Root rooster" git cms-init --upstream-only - cms-merge-commit cms-nanoAOD master 113b023b291dd986e00df80a415f6c6549c077a0 || return 1 + cms-merge-commit cms-nanoAOD master 7c6bce65ee16a01c0d991fdbf40c43dbcfa6202a || return 1 git cms-checkdeps -a || return 1 mkdir NANOX rsync -r --stats /scripts/ NANOX/. || return 1 From 5256e96a43e8bb8f59c16374d83c76f0b8b2c0c4 Mon Sep 17 00:00:00 2001 From: matt-komm Date: Thu, 18 Oct 2018 16:57:57 +0100 Subject: [PATCH 05/14] switch v --- test/runCMSSWTest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runCMSSWTest.sh b/test/runCMSSWTest.sh index b673677..3de6b48 100755 --- a/test/runCMSSWTest.sh +++ b/test/runCMSSWTest.sh @@ -25,8 +25,8 @@ function run_test() cd ~ source ~/.bashrc export SCRAM_ARCH=slc6_amd64_gcc630 || return 1 - scramv1 project CMSSW CMSSW_9_4_8 || return 1 - cd CMSSW_9_4_8/src || return 1 + scramv1 project CMSSW CMSSW_9_4_9 || return 1 + cd CMSSW_9_4_9/src || return 1 eval `scramv1 runtime -sh` || return 1 git config --global user.email "root.rooster@chicken.com" git config --global user.name "Root rooster" From 219cbf5ca7ecb8a0412c80835bb451fce66f6201 Mon Sep 17 00:00:00 2001 From: matt-komm Date: Thu, 18 Oct 2018 17:15:08 +0100 Subject: [PATCH 06/14] switch v --- test/runCMSSWTest.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/runCMSSWTest.sh b/test/runCMSSWTest.sh index 3de6b48..43d43be 100755 --- a/test/runCMSSWTest.sh +++ b/test/runCMSSWTest.sh @@ -25,8 +25,8 @@ function run_test() cd ~ source ~/.bashrc export SCRAM_ARCH=slc6_amd64_gcc630 || return 1 - scramv1 project CMSSW CMSSW_9_4_9 || return 1 - cd CMSSW_9_4_9/src || return 1 + scramv1 project CMSSW CMSSW_9_4_10 || return 1 + cd CMSSW_9_4_10/src || return 1 eval `scramv1 runtime -sh` || return 1 git config --global user.email "root.rooster@chicken.com" git config --global user.name "Root rooster" From 7b5f49453dbc31e39fd7fc0bba3e933173919a91 Mon Sep 17 00:00:00 2001 From: matt-komm Date: Fri, 23 Nov 2018 13:31:16 +0000 Subject: [PATCH 07/14] update samples --- LLPSpecific/test/crab.py | 254 ++++++++++++++++++++++++-- LLPSpecific/test/produce_80X_NANOX.py | 3 +- 2 files changed, 240 insertions(+), 17 deletions(-) diff --git a/LLPSpecific/test/crab.py b/LLPSpecific/test/crab.py index 941f3aa..db1dff0 100644 --- a/LLPSpecific/test/crab.py +++ b/LLPSpecific/test/crab.py @@ -3,8 +3,8 @@ import copy import math -requestName = "NANOX_180425-v2" -isData = True +requestName = "NANOX_181121-v1" +isData = False userName = "mkomm" if isData==False: @@ -56,12 +56,95 @@ ], + "SMS-T1qqqq_ctau-0p001_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-0p001_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-0p1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-0p1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-10_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-10_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-1000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-1000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-10000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-10000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "SMS-T1qqqq_ctau-100000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_extra":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/SMS-T1qqqq_ctau-100000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/mkomm-LLP_miniaodv180920-312db0fc9b855c6adca5525185ce0591/USER"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",15), + lambda cfg: setattr(cfg.Data,"inputDBS","phys03"), + lambda cfg: cfg.JobType.pyCfgParams.append("addLLPInfo=True") + ], + "TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen":[ lambda cfg: setattr(cfg.Data,"inputDataset","/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], + "TT_TuneCUETP8M2T4_13TeV-powheg-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "TTJets_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + + "TTJets_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], "QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8":[ @@ -112,26 +195,166 @@ "DYJetsToLL_M-50_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), ], - "DYJetsToLL_M-10to50_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-10to50_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], + + "DYJetsToLL_M-10to50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-10to50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_ext1":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v2/MINIAODSIM"), + ], + "DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8_ext2":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), + ], + + "DYJetsToLL_M-50_HT-70to100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-70to100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-200to400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-200to400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-400to600_TuneCUETP8M1_13TeV-madgraphMLM-pythia":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-400to600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + "DYJetsToLL_M-50_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + + + + "ZJetsToNuNu_HT-100To200_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-100To200_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "ZJetsToNuNu_HT-200To400_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-200To400_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "ZJetsToNuNu_HT-400To600_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-400To600_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "ZJetsToNuNu_HT-600To800_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-600To800_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "ZJetsToNuNu_HT-800to1200_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-800To1200_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "ZJetsToNuNu_HT-1200To2500_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-1200To2500_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "ZJetsToNuNu_HT-2500ToInf_13TeV-madgraph":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/ZJetsToNuNu_HT-2500ToInf_13TeV-madgraph/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + + + + # === WJetsToLNu === + "WJetsToLNu_HT-70To100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-70To100_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-100To200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-100To200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-200To400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-200To400_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-400To600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-400To600_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-600To800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-600To800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-800To1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-800To1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-1200To2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-1200To2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WJetsToLNu_HT-2500ToInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WJetsToLNu_HT-2500ToInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + + + "WToLNu_0J_13TeV-amcatnloFXFX-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_0J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_backup_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "WToLNu_0J_13TeV-amcatnloFXFX-pythia8_ext1":[ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_0J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], + + "WToLNu_1J_13TeV-amcatnloFXFX-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_backup_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], - "WToLNu_2J_13TeV-amcatnloFXFX-pythia8":[ + "WToLNu_1J_13TeV-amcatnloFXFX-pythia8_ext1":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v3/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "WToLNu_1J_13TeV-amcatnloFXFX-pythia8_ext3":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext3-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "WToLNu_2J_13TeV-amcatnloFXFX-pythia8_ext1":[ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_2J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], + "WToLNu_2J_13TeV-amcatnloFXFX-pythia8_ext2":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_2J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "WToLNu_2J_13TeV-amcatnloFXFX-pythia8_ext3":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_2J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext3-v5/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + @@ -145,7 +368,6 @@ ], - "ST_tW_antitop_5f_inclusiveDecays_13TeV-powheg-pythia8_TuneCUETP8M1":[ lambda cfg: setattr(cfg.Data,"inputDataset","/ST_tW_antitop_5f_inclusiveDecays_13TeV-powheg-pythia8_TuneCUETP8M1/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], @@ -183,14 +405,14 @@ '/SingleMuon/Run2016H-03Feb2017_ver2-v1/MINIAOD', '/SingleMuon/Run2016H-03Feb2017_ver3-v1/MINIAOD', - '/SingleElectron/Run2016B-03Feb2017_ver2-v2/MINIAOD', - '/SingleElectron/Run2016C-03Feb2017-v1/MINIAOD', - '/SingleElectron/Run2016D-03Feb2017-v1/MINIAOD', - '/SingleElectron/Run2016E-03Feb2017-v1/MINIAOD', - '/SingleElectron/Run2016F-03Feb2017-v1/MINIAOD', - '/SingleElectron/Run2016G-03Feb2017-v1/MINIAOD', - '/SingleElectron/Run2016H-03Feb2017_ver2-v1/MINIAOD', - '/SingleElectron/Run2016H-03Feb2017_ver3-v1/MINIAOD' + '/MET/Run2016B-03Feb2017_ver2-v2/MINIAOD', + '/MET/Run2016C-03Feb2017-v1/MINIAOD', + '/MET/Run2016D-03Feb2017-v1/MINIAOD', + '/MET/Run2016E-03Feb2017-v1/MINIAOD', + '/MET/Run2016F-03Feb2017-v1/MINIAOD', + '/MET/Run2016G-03Feb2017-v1/MINIAOD', + '/MET/Run2016H-03Feb2017_ver2-v1/MINIAOD', + '/MET/Run2016H-03Feb2017_ver3-v1/MINIAOD', ]: datasetSplit = dataset.split('/') datasetName = datasetSplit[1]+"_"+datasetSplit[2] @@ -209,12 +431,12 @@ configTmpl.General.transferLogs = False configTmpl.section_('JobType') -configTmpl.JobType.psetName = "XTag/LLPSpecific/test/produce_80X_NANOX.py" +configTmpl.JobType.psetName = "NANOX/LLPSpecific/test/produce_80X_NANOX.py" configTmpl.JobType.pluginName = 'Analysis' configTmpl.JobType.outputFiles = ['nano.root'] -configTmpl.JobType.maxJobRuntimeMin=22*60 +configTmpl.JobType.maxJobRuntimeMin=12*60 configTmpl.JobType.pyCfgParams = [] -configTmpl.JobType.inputFiles = ['QGL_cmssw8020_v2.db'] +configTmpl.JobType.inputFiles = []#'QGL_cmssw8020_v2.db'] configTmpl.section_('Data') configTmpl.Data.inputDataset = "" diff --git a/LLPSpecific/test/produce_80X_NANOX.py b/LLPSpecific/test/produce_80X_NANOX.py index 33535e7..bc1e78c 100644 --- a/LLPSpecific/test/produce_80X_NANOX.py +++ b/LLPSpecific/test/produce_80X_NANOX.py @@ -81,7 +81,8 @@ process.source.fileNames = [ #'file:DYJetsToLL_M-50_TuneCUETP8M1_13TeV-madgraphMLM-pythia8.root' #'/store/mc/RunIISummer16MiniAODv2/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen/MINIAODSIM/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/80000/2C548AA6-91CF-E611-A86B-B083FED429D6.root', - 'root://cms-xrd-global.cern.ch//store/mc/RunIISummer16MiniAODv2/SMS-T1qqqq_ctau-1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_GridpackScan_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/10000/000486C0-2588-E711-8E92-0025905A48BA.root', + #'root://cms-xrd-global.cern.ch//store/mc/RunIISummer16MiniAODv2/SMS-T1qqqq_ctau-1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_GridpackScan_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/10000/000486C0-2588-E711-8E92-0025905A48BA.root', + 'root://cms-xrd-global.cern.ch//store/user/mkomm/LLP/LLP_miniaodv180920/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/LLP_miniaodv180920/180926_190502/0000/T1qqqqLL_MINIAODSIM_190.root', #'root://cmsxrootd.fnal.gov//store/mc/RunIISummer16MiniAODv2/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_GridpackScan_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/110000/0C07E448-338A-E711-B877-0CC47A4D75F2.root' #"root://cmsxrootd.fnal.gov//store/mc/RunIISummer16MiniAODv2/QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8/MINIAODSIM/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/120000/04915DCA-1BB2-E611-8A4B-0CC47A4C8E56.root" #"root://cmsxrootd.fnal.gov//store/mc/RunIISummer16MiniAODv2/QCD_Pt_50to80_TuneCUETP8M1_13TeV_pythia8/MINIAODSIM/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/110000/00898E1E-99B1-E611-8A4A-C81F66C8BA4C.root", From 239a63059e89418ba4d30b69144cdd6e922cece1 Mon Sep 17 00:00:00 2001 From: Root rooster Date: Mon, 3 Jun 2019 12:20:50 +0200 Subject: [PATCH 08/14] remove pre-processing --- Jet/interface/ChargedPFTagData.h | 2 ++ Jet/interface/GlobalJetTagData.h | 2 +- Jet/interface/SVTagData.h | 4 ++-- Jet/plugins/CSVInputTagPlugin.cc | 28 ++++++---------------------- Jet/plugins/ChargedPFTagPlugin.cc | 28 +++++++++++++++------------- Jet/plugins/NeutralPFTagPlugin.cc | 7 ++++--- Jet/plugins/SVTagPlugin.cc | 18 +++++++++--------- 7 files changed, 39 insertions(+), 50 deletions(-) diff --git a/Jet/interface/ChargedPFTagData.h b/Jet/interface/ChargedPFTagData.h index 44f1e1f..136889e 100644 --- a/Jet/interface/ChargedPFTagData.h +++ b/Jet/interface/ChargedPFTagData.h @@ -34,6 +34,7 @@ class ChargedPFTagData: float fromPV; float puppi_weight; float track_chi2; + float track_ndof; float track_quality; float jetmassdroprel; @@ -78,6 +79,7 @@ class ChargedPFTagData: cpfDataArray.bookProperty("fromPV",&Data::fromPV); cpfDataArray.bookProperty("puppi_weight",&Data::puppi_weight); cpfDataArray.bookProperty("track_chi2",&Data::track_chi2); + cpfDataArray.bookProperty("track_ndof",&Data::track_ndof); cpfDataArray.bookProperty("track_quality",&Data::track_quality); cpfDataArray.bookProperty("jetmassdroprel",&Data::jetmassdroprel); diff --git a/Jet/interface/GlobalJetTagData.h b/Jet/interface/GlobalJetTagData.h index be10308..f7fb2c6 100644 --- a/Jet/interface/GlobalJetTagData.h +++ b/Jet/interface/GlobalJetTagData.h @@ -38,7 +38,7 @@ class GlobalJetTagData: array.bookProperty("pt", &Data::pt); array.bookProperty("eta", &Data::eta); array.bookProperty("phi", &Data::phi); - array.bookProperty("jetIdx", &Data::phi); + array.bookProperty("jetIdx", &Data::jetIdx); for (unsigned int i = 0; i < jetData.size(); ++i) { array.fill(&jetData[i], i); diff --git a/Jet/interface/SVTagData.h b/Jet/interface/SVTagData.h index 48b0585..ed40410 100644 --- a/Jet/interface/SVTagData.h +++ b/Jet/interface/SVTagData.h @@ -20,7 +20,7 @@ class SVTagData: float mass; float ntracks; float chi2; - float normchi2; + float ndof; float dxy; float dxysig; float d3d; @@ -49,7 +49,7 @@ class SVTagData: svDataArray.bookProperty("mass",&Data::mass); svDataArray.bookProperty("ntracks",&Data::ntracks); svDataArray.bookProperty("chi2",&Data::chi2); - svDataArray.bookProperty("normchi2",&Data::normchi2); + svDataArray.bookProperty("ndof",&Data::ndof); svDataArray.bookProperty("dxy",&Data::dxy); svDataArray.bookProperty("dxysig",&Data::dxysig); svDataArray.bookProperty("d3d",&Data::d3d); diff --git a/Jet/plugins/CSVInputTagPlugin.cc b/Jet/plugins/CSVInputTagPlugin.cc index c68f654..7e18192 100644 --- a/Jet/plugins/CSVInputTagPlugin.cc +++ b/Jet/plugins/CSVInputTagPlugin.cc @@ -91,31 +91,15 @@ class CSVInputTagDataPlugin: //the significances take often the values -1 //this maybe a bug and happen if trackSip2dValAboveCharm = -1 thus the reset value is ignored //cmslxr.fnal.gov/source/RecoBTag/SecondaryVertex/plugins/TemplatedSecondaryVertexProducer.cc?v=CMSSW_9_4_0 - if (trackSip2dValAboveCharm<0) - { - trackSip2dSigAboveCharm = -1; - jetTagData.trackSip2dValAboveCharm = trackSip2dValAboveCharm; - jetTagData.trackSip2dSigAboveCharm = trackSip2dSigAboveCharm; - } - else - { - jetTagData.trackSip2dValAboveCharm = trackSip2dValAboveCharm; - jetTagData.trackSip2dSigAboveCharm = std::log10(1+trackSip2dSigAboveCharm); - } + jetTagData.trackSip2dValAboveCharm = trackSip2dValAboveCharm; + jetTagData.trackSip2dSigAboveCharm = trackSip2dSigAboveCharm; float trackSip3dValAboveCharm = vars.get(reco::btau::trackSip2dValAboveCharm, -1); float trackSip3dSigAboveCharm = vars.get(reco::btau::trackSip3dSigAboveCharm, -1); - if (trackSip3dValAboveCharm<0) - { - trackSip3dSigAboveCharm = -1; - jetTagData.trackSip3dValAboveCharm = trackSip3dValAboveCharm; - jetTagData.trackSip3dSigAboveCharm = trackSip3dSigAboveCharm; - } - else - { - jetTagData.trackSip3dValAboveCharm = trackSip3dValAboveCharm; - jetTagData.trackSip3dSigAboveCharm = std::log10(10+trackSip3dSigAboveCharm); - } + + jetTagData.trackSip3dValAboveCharm = trackSip3dValAboveCharm; + jetTagData.trackSip3dSigAboveCharm = trackSip3dSigAboveCharm; + output->at(0).jetData.push_back(jetTagData); } diff --git a/Jet/plugins/ChargedPFTagPlugin.cc b/Jet/plugins/ChargedPFTagPlugin.cc index 6f3ea34..b522111 100644 --- a/Jet/plugins/ChargedPFTagPlugin.cc +++ b/Jet/plugins/ChargedPFTagPlugin.cc @@ -90,7 +90,7 @@ class ChargedPFTagDataPlugin: nanox::ChargedPFTagData::Data data; - data.ptrel = 0.01/(0.01+constituent->pt()/jet_pt_uncorr); + data.ptrel = constituent->pt()/jet_pt_uncorr; data.drminsv = 0.4; for (const auto& sv: *svCollection.product()) @@ -102,10 +102,12 @@ class ChargedPFTagDataPlugin: data.vertex_association = constituent->pvAssociationQuality(); data.fromPV = constituent->fromPV(); data.puppi_weight = constituent->puppiWeight(); - data.track_chi2 = std::log10(constituent->pseudoTrack().chi2()/constituent->pseudoTrack().ndof()+1); + data.track_chi2 = constituent->pseudoTrack().chi2(); + data.track_ndof = constituent->pseudoTrack().ndof(); data.track_quality = constituent->pseudoTrack().qualityMask(); + if (jet.mass()<1e-10) data.jetmassdroprel = 0; - else data.jetmassdroprel = std::log10(1-(jet.p4()-constituent->p4()).mass()/jet.mass()); + else data.jetmassdroprel = (jet.p4()-constituent->p4()).mass()/jet.mass(); reco::TransientTrack transientTrack = builder->build(constituent->pseudoTrack()); reco::Candidate::Vector jetDir = jet.momentum().Unit(); @@ -120,18 +122,18 @@ class ChargedPFTagDataPlugin: TVector3 jetDir3(jetDir.x(),jetDir.y(),jetDir.z()); data.trackEtaRel=reco::btau::etaRel(jetDir, trackMom); - data.trackPtRel=std::log10(trackMom3.Perp(jetDir3)); - data.trackPPar=std::log10(1+jetDir.Dot(trackMom)); + data.trackPtRel=trackMom3.Perp(jetDir3); + data.trackPPar=jetDir.Dot(trackMom); data.trackDeltaR=reco::deltaR(trackMom, jetDir); - data.trackPtRatio=std::log10(1-data.trackPtRel / trackMag); - data.trackPParRatio=std::log10(1+data.trackPPar / trackMag); + data.trackPtRatio=data.trackPtRel / trackMag; + data.trackPParRatio=data.trackPPar / trackMag; - data.trackSip2dVal=std::copysign(std::log10(std::fabs(meas_ip2d.value())),meas_ip2d.value()); - data.trackSip2dSig=std::copysign(std::log10(std::fabs(meas_ip2d.significance())),meas_ip2d.significance()); - data.trackSip3dVal=std::copysign(std::log10(std::fabs(meas_ip3d.value())),meas_ip3d.value()); - data.trackSip3dSig=std::copysign(std::log10(std::fabs(meas_ip3d.significance())),meas_ip3d.significance()); + data.trackSip2dVal=std::abs(meas_ip2d.value()); + data.trackSip2dSig=std::abs(meas_ip2d.significance()); + data.trackSip3dVal=std::abs(meas_ip3d.value()); + data.trackSip3dSig=std::abs(meas_ip3d.significance()); - data.trackJetDistVal = std::log10(1-jetdist.value()); + data.trackJetDistVal = jetdist.value(); data.trackJetDistSig = jetdist.significance(); float sumPt = 0.; @@ -143,7 +145,7 @@ class ChargedPFTagDataPlugin: sumPt += other->pt(); } } - data.relIso01 = 10./(10.+sumPt/constituent->pt()); + data.relIso01 = sumPt/constituent->pt(); data.lostInnerHits = constituent->lostInnerHits(); //http://cmsdoxygen.web.cern.ch/cmsdoxygen/CMSSW_9_4_4/doc/html/d8/d79/classpat_1_1PackedCandidate.html#ab9ef9a12f92e02fa61653ba77ee34274 diff --git a/Jet/plugins/NeutralPFTagPlugin.cc b/Jet/plugins/NeutralPFTagPlugin.cc index caf654f..ac4b154 100644 --- a/Jet/plugins/NeutralPFTagPlugin.cc +++ b/Jet/plugins/NeutralPFTagPlugin.cc @@ -76,7 +76,7 @@ class NeutralPFTagDataPlugin: nanox::NeutralPFTagData::Data data; - data.ptrel = 0.01/(0.01+constituent->pt()/jet_pt_uncorr); + data.ptrel = constituent->pt()/jet_pt_uncorr; data.puppi_weight = constituent->puppiWeight(); data.deltaR = reco::deltaR(*constituent,jet); data.isGamma = fabs(constituent->pdgId())==22; @@ -90,7 +90,8 @@ class NeutralPFTagDataPlugin: } if (jet.mass()<1e-10) data.jetmassdroprel = 0; - else data.jetmassdroprel = std::log10(1-(jet.p4()-constituent->p4()).mass()/jet.mass()); + else data.jetmassdroprel = (jet.p4()- constituent->p4()).mass()/jet.mass(); + float sumPt = 0.; for (unsigned int jdaughter = 0; jdaughter < jet.numberOfDaughters(); ++jdaughter) @@ -101,7 +102,7 @@ class NeutralPFTagDataPlugin: sumPt += other->pt(); } } - data.relIso01 = 10./(10.+sumPt/constituent->pt()); + data.relIso01 = sumPt/constituent->pt(); npfData.emplace_back(data); } diff --git a/Jet/plugins/SVTagPlugin.cc b/Jet/plugins/SVTagPlugin.cc index 64f355d..88e800c 100644 --- a/Jet/plugins/SVTagPlugin.cc +++ b/Jet/plugins/SVTagPlugin.cc @@ -87,10 +87,10 @@ class SVTagDataPlugin: data.pt = std::log10(sv.pt()); data.deltaR = reco::deltaR(sv,jet); - data.mass = std::log10(1+sv.mass()); + data.mass = sv.mass(); data.ntracks = sv.numberOfDaughters(); - data.chi2 = std::log10(sv.vertexChi2()); - data.normchi2 = std::log10(sv.vertexChi2()/sv.vertexNdof()); + data.chi2 = sv.vertexChi2(); + data.ndof = sv.vertexNdof(); reco::Vertex::CovarianceMatrix covsv; sv.fillVertexCovariance(covsv); @@ -98,18 +98,18 @@ class SVTagDataPlugin: VertexDistanceXY distXY; Measurement1D distanceXY = distXY.distance(svtx, pv); - data.dxy = 0.1/(0.1+distanceXY.value()); - data.dxysig = std::log10(distanceXY.value()/distanceXY.error()); + data.dxy = distanceXY.value(); + data.dxysig = distanceXY.value()/distanceXY.error(); VertexDistance3D dist3D; Measurement1D distance3D = dist3D.distance(svtx, pv); - data.d3d = 0.1/(0.1+distance3D.value()); - data.d3dsig = std::log10(distance3D.value()/distance3D.error()); + data.d3d = distance3D.value(); + data.d3dsig = distance3D.value()/distance3D.error(); reco::Candidate::Vector distance(sv.vx() - pv.x(), sv.vy() - pv.y(), sv.vz() - pv.z()); - data.costhetasvpv = 0.01/(1.01-sv.momentum().Unit().Dot(distance.Unit())); + data.costhetasvpv = sv.momentum().Unit().Dot(distance.Unit()); - data.enratio = 0.1/(0.1+sv.energy()/jet_e_uncorr); + data.enratio = sv.energy()/jet_e_uncorr; svData.emplace_back(data); From 60981dd9707b5b1151e294afa17c6c78bbab0725 Mon Sep 17 00:00:00 2001 From: Root rooster Date: Tue, 4 Jun 2019 13:57:00 +0100 Subject: [PATCH 09/14] deepflavour --- LLPSpecific/test/produce_80X_NANOX.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/LLPSpecific/test/produce_80X_NANOX.py b/LLPSpecific/test/produce_80X_NANOX.py index ef2b6f0..a780bea 100644 --- a/LLPSpecific/test/produce_80X_NANOX.py +++ b/LLPSpecific/test/produce_80X_NANOX.py @@ -274,7 +274,14 @@ def addFilter(seq,inputTag,cutString,minN=None): 'pfDeepCSVJetTags:probc', 'pfDeepCSVJetTags:probbb', #'pfDeepCSVJetTags:probcc', + 'pfDeepFlavourJetTags:probb', + 'pfDeepFlavourJetTags:probbb', + 'pfDeepFlavourJetTags:problepb', + #'pfDeepFlavourJetTags:probc', + #'pfDeepFlavourJetTags:probuds', + #'pfDeepFlavourJetTags:probg' ] + updateJetCollection( process, labelName = "XTag", From 8890b19448c795648bc03bf16cb99608858eab4d Mon Sep 17 00:00:00 2001 From: Root rooster Date: Tue, 4 Jun 2019 14:06:52 +0100 Subject: [PATCH 10/14] up --- LLPSpecific/test/crab.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LLPSpecific/test/crab.py b/LLPSpecific/test/crab.py index 479e7d1..e0654a4 100644 --- a/LLPSpecific/test/crab.py +++ b/LLPSpecific/test/crab.py @@ -6,7 +6,7 @@ requestName = "NANOX_190604" isData = False userName = "vcepaiti" -#userName = "vcepaiti" +#userName = "mkomm" myJobs = { From 049cd2436f4c9ceceea7c05b800360806a757005 Mon Sep 17 00:00:00 2001 From: Root rooster Date: Wed, 5 Jun 2019 14:16:53 +0200 Subject: [PATCH 11/14] move samples --- LLPSpecific/test/crab.py | 138 +++++++++++++++++++++------------------ 1 file changed, 76 insertions(+), 62 deletions(-) diff --git a/LLPSpecific/test/crab.py b/LLPSpecific/test/crab.py index 832fc10..2c9c12e 100644 --- a/LLPSpecific/test/crab.py +++ b/LLPSpecific/test/crab.py @@ -79,37 +79,77 @@ ], # ttbar - - "TTJets_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + + "TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + "TTJets_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - + + "TTJets_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-600to800_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-800to1200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-1200to2500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + + "TTJets_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/TTJets_HT-2500toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + # QCD - - "QCD_HT100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_HT200to300_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT200to300_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_50to80_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_50to80_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_HT300to500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT300to500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_80to120_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_80to120_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), ], - "QCD_HT500to700_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT500to700_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_120to170_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_120to170_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], - "QCD_HT700to1000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT700to1000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_170to300_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_170to300_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], - "QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_300to470_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_300to470_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], - "QCD_HT1500to2000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT1500to2000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_470to600_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_470to600_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_HT2000toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT2000toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_Pt_600to800_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_600to800_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "QCD_Pt_800to1000_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_800to1000_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], + "QCD_Pt_1000to1400_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_1000to1400_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "QCD_Pt_1400to1800_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_1400to1800_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "QCD_Pt_1800to2400_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_1800to2400_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + ], + "QCD_Pt_2400to3200_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_2400to3200_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + ], + "QCD_Pt_3200toInf_TuneCUETP8M1_13TeV_pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_3200toInf_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v3/MINIAODSIM"), + ], + + # Evaluation samples @@ -287,60 +327,35 @@ # ttbar - - "TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8-evtgen/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), - lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) - ], - - "TT_TuneCUETP8M2T4_13TeV-powheg-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/TT_TuneCUETP8M2T4_13TeV-powheg-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], # QCD - "QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), - ], - "QCD_Pt_50to80_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_50to80_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), - ], - "QCD_Pt_80to120_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_80to120_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), - ], - "QCD_Pt_120to170_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_120to170_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), - ], - "QCD_Pt_170to300_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_170to300_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), - ], - "QCD_Pt_300to470_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_300to470_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), - ], - "QCD_Pt_470to600_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_470to600_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_HT100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT100to200_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_600to800_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_600to800_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + "QCD_HT200to300_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT200to300_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_800to1000_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_800to1000_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + "QCD_HT300to500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT300to500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_1000to1400_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_1000to1400_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + "QCD_HT500to700_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT500to700_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_1400to1800_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_1400to1800_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + "QCD_HT700to1000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT700to1000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_1800to2400_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_1800to2400_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + "QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT1000to1500_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_2400to3200_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_2400to3200_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), + "QCD_HT1500to2000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT1500to2000_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], - "QCD_Pt_3200toInf_TuneCUETP8M1_13TeV_pythia8":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_3200toInf_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v3/MINIAODSIM"), + "QCD_HT2000toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_HT2000toInf_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), ], # wjets @@ -381,7 +396,6 @@ ], # DYjets - "DYJetsToLL_M-50_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/DYJetsToLL_M-50_TuneCUETP8M1_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), ], From d0a74aad5ff444039cd794830ab982af49a86856 Mon Sep 17 00:00:00 2001 From: Root rooster Date: Wed, 5 Jun 2019 14:39:36 +0200 Subject: [PATCH 12/14] move more samples --- LLPSpecific/test/crab.py | 41 +++++++++++++++++++++------------------- 1 file changed, 22 insertions(+), 19 deletions(-) diff --git a/LLPSpecific/test/crab.py b/LLPSpecific/test/crab.py index 2c9c12e..47bbf3d 100644 --- a/LLPSpecific/test/crab.py +++ b/LLPSpecific/test/crab.py @@ -3,7 +3,7 @@ import copy import math -requestName = "NANOX_190604" +requestName = "NANOX_190606" isData = False userName = "vcepaiti" #userName = "mkomm" @@ -148,11 +148,24 @@ "QCD_Pt_3200toInf_TuneCUETP8M1_13TeV_pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/QCD_Pt_3200toInf_TuneCUETP8M1_13TeV_pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v3/MINIAODSIM"), ], - - - # Evaluation samples + # WJets + "WToLNu_0J_13TeV-amcatnloFXFX-pythia8_ext1":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_0J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "WToLNu_1J_13TeV-amcatnloFXFX-pythia8_ext1":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v3/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + "WToLNu_2J_13TeV-amcatnloFXFX-pythia8_ext1":[ + lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_2J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), + lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) + ], + + # Evaluation samples + ''' # split SUSY # official samples @@ -364,28 +377,17 @@ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_0J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_backup_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], - "WToLNu_0J_13TeV-amcatnloFXFX-pythia8_ext1":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_0J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), - lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) - ], - "WToLNu_1J_13TeV-amcatnloFXFX-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_backup_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], - "WToLNu_1J_13TeV-amcatnloFXFX-pythia8_ext1":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v3/MINIAODSIM"), - lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) - ], + "WToLNu_1J_13TeV-amcatnloFXFX-pythia8_ext3":[ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_1J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext3-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) ], - "WToLNu_2J_13TeV-amcatnloFXFX-pythia8_ext1":[ - lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_2J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), - lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) - ], + "WToLNu_2J_13TeV-amcatnloFXFX-pythia8_ext2":[ lambda cfg: setattr(cfg.Data,"inputDataset","/WToLNu_2J_13TeV-amcatnloFXFX-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext2-v1/MINIAODSIM"), lambda cfg: setattr(cfg.Data,"unitsPerJob",int(math.ceil(cfg.Data.unitsPerJob/3.*2))) @@ -470,7 +472,7 @@ "ZZ_TuneCUETP8M1_13TeV-pythia8":[ lambda cfg: setattr(cfg.Data,"inputDataset","/ZZ_TuneCUETP8M1_13TeV-pythia8/RunIISummer16MiniAODv2-PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6_ext1-v1/MINIAODSIM"), ], - + ''' } # DATA @@ -483,7 +485,7 @@ '/SingleMuon/Run2016G-03Feb2017-v1/MINIAOD', '/SingleMuon/Run2016H-03Feb2017_ver2-v1/MINIAOD', '/SingleMuon/Run2016H-03Feb2017_ver3-v1/MINIAOD', - + ''' '/MET/Run2016B-03Feb2017_ver2-v2/MINIAOD', '/MET/Run2016C-03Feb2017-v1/MINIAOD', '/MET/Run2016D-03Feb2017-v1/MINIAOD', @@ -492,6 +494,7 @@ '/MET/Run2016G-03Feb2017-v1/MINIAOD', '/MET/Run2016H-03Feb2017_ver2-v1/MINIAOD', '/MET/Run2016H-03Feb2017_ver3-v1/MINIAOD', + ''' ]: datasetSplit = dataset.split('/') datasetName = datasetSplit[1]+"_"+datasetSplit[2] From d473a18e43238fbb2b39297ea5b4405aea892063 Mon Sep 17 00:00:00 2001 From: Root rooster Date: Wed, 5 Jun 2019 14:44:48 +0200 Subject: [PATCH 13/14] fix producer --- LLPSpecific/test/produce_80X_NANOX.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/LLPSpecific/test/produce_80X_NANOX.py b/LLPSpecific/test/produce_80X_NANOX.py index d2e26b1..ecbb359 100644 --- a/LLPSpecific/test/produce_80X_NANOX.py +++ b/LLPSpecific/test/produce_80X_NANOX.py @@ -96,7 +96,7 @@ #'root://cms-xrd-global.cern.ch//store/mc/RunIISummer16MiniAODv2/gluinoGMSB_M2000_ctau300p0_TuneCUETP8M1_13TeV_pythia8/MINIAODSIM/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/50000/DC2F0032-5BC9-E611-BC7B-D48564593FA8.root' #'root://cms-xrd-global.cern.ch//store/user/tstreble/T1qqqqLL_ctau-0p001_Madgraph_Pythia_GEN-SIM/T1qqqqLL_ctau-0p001_Madgraph_Pythia_MINIAODSIM_18_01_11/180111_112650/0000/T1qqqqLL_MINIAODSIM_1.root' #'root://cms-xrd-global.cern.ch//store/mc/RunIISummer16MiniAODv2/SMS-T1qqqq_ctau-1_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_GridpackScan_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/10000/000486C0-2588-E711-8E92-0025905A48BA.root', - 'root://cms-xrd-global.cern.ch//store/user/mkomm/LLP/LLP_miniaodv180920/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/LLP_miniaodv180920/180926_190502/0000/T1qqqqLL_MINIAODSIM_190.root', + #'root://cms-xrd-global.cern.ch//store/user/mkomm/LLP/LLP_miniaodv180920/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/LLP_miniaodv180920/180926_190502/0000/T1qqqqLL_MINIAODSIM_190.root', #'root://cmsxrootd.fnal.gov//store/mc/RunIISummer16MiniAODv2/SMS-T1qqqq_ctau-0p01_TuneCUETP8M1_13TeV-madgraphMLM-pythia8/MINIAODSIM/PUMoriond17_GridpackScan_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v2/110000/0C07E448-338A-E711-B877-0CC47A4D75F2.root' #"root://cmsxrootd.fnal.gov//store/mc/RunIISummer16MiniAODv2/QCD_Pt_30to50_TuneCUETP8M1_13TeV_pythia8/MINIAODSIM/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/120000/04915DCA-1BB2-E611-8A4B-0CC47A4C8E56.root" #"root://cmsxrootd.fnal.gov//store/mc/RunIISummer16MiniAODv2/QCD_Pt_50to80_TuneCUETP8M1_13TeV_pythia8/MINIAODSIM/PUMoriond17_80X_mcRun2_asymptotic_2016_TrancheIV_v6-v1/110000/00898E1E-99B1-E611-8A4A-C81F66C8BA4C.root", @@ -267,7 +267,6 @@ def addFilter(seq,inputTag,cutString,minN=None): 'pfDeepFlavourTagInfos', ] bTagDiscriminators = [ -<<<<<<< HEAD #'softPFMuonBJetTags', #'softPFElectronBJetTags', #'pfJetBProbabilityBJetTags', From 61408f49c276cefe020c35cd8b9d2f89ca6a0cef Mon Sep 17 00:00:00 2001 From: Root rooster Date: Wed, 5 Jun 2019 15:31:46 +0200 Subject: [PATCH 14/14] fix CSVv2 --- Jet/plugins/CSVInputTagPlugin.cc | 5 +---- Jet/plugins/ChargedPFTagPlugin.cc | 1 - Jet/plugins/JetOriginTagPlugin.cc | 2 +- Jet/plugins/NeutralPFTagPlugin.cc | 3 +-- LLPSpecific/test/produce_80X_NANOX.py | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Jet/plugins/CSVInputTagPlugin.cc b/Jet/plugins/CSVInputTagPlugin.cc index 7e18192..635d32c 100644 --- a/Jet/plugins/CSVInputTagPlugin.cc +++ b/Jet/plugins/CSVInputTagPlugin.cc @@ -74,14 +74,11 @@ class CSVInputTagDataPlugin: //http://cmslxr.fnal.gov/source/DataFormats/BTauReco/interface/TaggingVariable.h?v=CMSSW_9_4_0_pre1#0033 float trackSumJetEtRatio = vars.get(reco::btau::trackSumJetEtRatio, -1); - if (trackSumJetEtRatio>0) trackSumJetEtRatio = 0.1/(0.1+trackSumJetEtRatio); jetTagData.trackSumJetEtRatio = trackSumJetEtRatio; float trackSumJetDeltaR = vars.get(reco::btau::trackSumJetDeltaR, -1); - if (trackSumJetDeltaR>0) trackSumJetDeltaR = 0.1/(0.1+trackSumJetDeltaR); jetTagData.trackSumJetDeltaR = trackSumJetDeltaR; - - + jetTagData.vertexCategory = vars.get(reco::btau::vertexCategory, -1); jetTagData.jetNSelectedTracks = vars.get(reco::btau::jetNSelectedTracks, -1); jetTagData.jetNTracksEtaRel = vars.get(reco::btau::jetNTracksEtaRel, -1); diff --git a/Jet/plugins/ChargedPFTagPlugin.cc b/Jet/plugins/ChargedPFTagPlugin.cc index b522111..dd36f4b 100644 --- a/Jet/plugins/ChargedPFTagPlugin.cc +++ b/Jet/plugins/ChargedPFTagPlugin.cc @@ -77,7 +77,6 @@ class ChargedPFTagDataPlugin: { const pat::Jet& jet = jetCollection->at(ijet); const float jet_pt_uncorr = jet.correctedJet("Uncorrected").pt(); - //const float jet_e_uncorr = jet.correctedJet("Uncorrected").energy(); std::vector cpfData; for (unsigned int idaughter = 0; idaughter < jet.numberOfDaughters(); ++idaughter) diff --git a/Jet/plugins/JetOriginTagPlugin.cc b/Jet/plugins/JetOriginTagPlugin.cc index 1493af3..2b10002 100644 --- a/Jet/plugins/JetOriginTagPlugin.cc +++ b/Jet/plugins/JetOriginTagPlugin.cc @@ -120,7 +120,7 @@ class JetOriginTagDataPlugin: { mother = mother->mother(); } - //find gluon anchestor + //find gluon ancestor if (mother->mother() and mother->mother()->pdgId()==21) { nGluons+=1; diff --git a/Jet/plugins/NeutralPFTagPlugin.cc b/Jet/plugins/NeutralPFTagPlugin.cc index ac4b154..8d378ca 100644 --- a/Jet/plugins/NeutralPFTagPlugin.cc +++ b/Jet/plugins/NeutralPFTagPlugin.cc @@ -63,7 +63,6 @@ class NeutralPFTagDataPlugin: { const pat::Jet& jet = jetCollection->at(ijet); const float jet_pt_uncorr = jet.correctedJet("Uncorrected").pt(); - //const float jet_e_uncorr = jet.correctedJet("Uncorrected").energy(); std::vector npfData; for (unsigned int idaughter = 0; idaughter < jet.numberOfDaughters(); ++idaughter) @@ -89,7 +88,7 @@ class NeutralPFTagDataPlugin: data.drminsv = std::min(data.drminsv,dR); } - if (jet.mass()<1e-10) data.jetmassdroprel = 0; + if (jet.mass()<1e-10) data.jetmassdroprel = -9; else data.jetmassdroprel = (jet.p4()- constituent->p4()).mass()/jet.mass(); diff --git a/LLPSpecific/test/produce_80X_NANOX.py b/LLPSpecific/test/produce_80X_NANOX.py index ecbb359..3791c9b 100644 --- a/LLPSpecific/test/produce_80X_NANOX.py +++ b/LLPSpecific/test/produce_80X_NANOX.py @@ -271,7 +271,7 @@ def addFilter(seq,inputTag,cutString,minN=None): #'softPFElectronBJetTags', #'pfJetBProbabilityBJetTags', #'pfJetProbabilityBJetTags', - 'pfCombinedInclusiveSecondaryVertexV2BJetTags', + 'pfCombinedSecondaryVertexV2BJetTags', 'pfDeepCSVJetTags:probudsg', #to be fixed with new names 'pfDeepCSVJetTags:probb', 'pfDeepCSVJetTags:probc',