Commit 988cf01e authored by Dennis Noll's avatar Dennis Noll
Browse files

[tasks] misc: updated jsons

parent 2432b068
......@@ -6,6 +6,7 @@ import time
import law
import luigi
from tqdm import tqdm
from tasks.base import ConfigTask, BaseTask
from tasks.files import DownloadNanoAODs
......@@ -179,11 +180,37 @@ class QueryDatasets(BaseTask):
"/TTTT_TuneCP5_13TeV-amcatnlo-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM": "/TTTT_TuneCP5_13TeV-amcatnlo-pythia8/RunIIFall17NanoAODv6-PU2017_12Apr2018_Nano25Oct2019_102X_mc2017_realistic_v7-v1/NANOAODSIM"
},
"v7": {
"/GluGluToHHTo2B2VTo2L2Nu_node_2_13TeV-madgraph-v2/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v3/MINIAODSIM": "/GluGluToHHTo2B2VTo2L2Nu_node_2_13TeV-madgraph/RunIISummer16NanoAODv7-PUMoriond17_Nano02Apr2020_102X_mcRun2_asymptotic_v8-v1/NANOAODSIM",
"/GluGluToRadionToHHTo2B2Tau_M-650_narrow_13TeV-madgraph/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v2/MINIAODSIM": "/GluGluToRadionToHHTo2B2Tau_M-650_narrow_13TeV-madgraph/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM",
"/GluGluToBulkGravitonToHHTo2B2WToLNu2J_M-3000_narrow_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM": "/GluGluToBulkGravitonToHHTo2B2WToLNu2J_M-3000_narrow_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM",
"/GluGluToHHTo2B2WToLNu2J_node_8_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM": "/GluGluToHHTo2B2WToLNu2J_node_8_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM",
"/TTTT_TuneCP5_13TeV-amcatnlo-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM": "/TTTT_TuneCP5_13TeV-amcatnlo-pythia8/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM",
"/SingleElectron/Run2016B-17Jul2018_ver2-v1/MINIAOD": [
"/SingleElectron/Run2016B-02Apr2020_ver2-v1/NANOAOD"
],
"/SingleMuon/Run2016B-17Jul2018_ver2-v1/MINIAOD": [
"/SingleMuon/Run2016B-02Apr2020_ver2-v1/NANOAOD"
],
"/DoubleEG/Run2016B-17Jul2018_ver2-v1/MINIAOD": [
"/DoubleEG/Run2016B-02Apr2020_ver2-v1/NANOAOD"
],
"/DoubleMuon/Run2016B-17Jul2018_ver2-v1/MINIAOD": [
"/DoubleMuon/Run2016B-02Apr2020_ver2-v1/NANOAOD"
],
"/MuonEG/Run2016B-17Jul2018_ver2-v1/MINIAOD": [
"/MuonEG/Run2016B-02Apr2020_ver2-v1/NANOAOD"
],
"/MuonEG/Run2016E-17Jul2018-v2/MINIAOD": ["/MuonEG/Run2016E-02Apr2020-v2/NANOAOD"],
"/GluGluToHHTo2B2VTo2L2Nu_node_2_13TeV-madgraph-v2/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v3/MINIAODSIM": [
"/GluGluToHHTo2B2VTo2L2Nu_node_2_13TeV-madgraph/RunIISummer16NanoAODv7-PUMoriond17_Nano02Apr2020_102X_mcRun2_asymptotic_v8-v1/NANOAODSIM"
],
"/GluGluToRadionToHHTo2B2Tau_M-650_narrow_13TeV-madgraph/RunIISummer16MiniAODv3-PUMoriond17_94X_mcRun2_asymptotic_v3-v2/MINIAODSIM": [
"/GluGluToRadionToHHTo2B2Tau_M-650_narrow_13TeV-madgraph/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM"
],
"/GluGluToBulkGravitonToHHTo2B2WToLNu2J_M-3000_narrow_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM": [
"/GluGluToBulkGravitonToHHTo2B2WToLNu2J_M-3000_narrow_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM"
],
"/GluGluToHHTo2B2WToLNu2J_node_8_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v1/MINIAODSIM": [
"/GluGluToHHTo2B2WToLNu2J_node_8_TuneCP5_PSWeights_13TeV-madgraph-pythia8/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM"
],
"/TTTT_TuneCP5_13TeV-amcatnlo-pythia8/RunIIFall17MiniAODv2-PU2017_12Apr2018_94X_mc2017_realistic_v14-v2/MINIAODSIM": [
"/TTTT_TuneCP5_13TeV-amcatnlo-pythia8/RunIIFall17NanoAODv7-PU2017_12Apr2018_Nano02Apr2020_102X_mc2017_realistic_v8-v1/NANOAODSIM"
],
},
}
......@@ -221,9 +248,9 @@ class QueryDatasets(BaseTask):
2018: {"name": "Nano25Oct2019"},
},
"v7": {
2016: {"name": "Nano25Oct2019"},
2017: {"name": "Nano25Oct2019"},
2018: {"name": "Nano25Oct2019"},
2016: {"name": "02Apr2020"},
2017: {"name": "02Apr2020"},
2018: {"name": "02Apr2020"},
},
}
# create logger
......@@ -238,7 +265,7 @@ class QueryDatasets(BaseTask):
for year, datasets in self.input().load().items():
year = int(year)
all_subs = []
for dataset in datasets:
for dataset in tqdm(datasets):
is_data = dataset["is_data"]
ppd = ppd_data[self.nanover] if is_data else ppd_sim[self.nanover]
subs = []
......@@ -269,9 +296,12 @@ class QueryDatasets(BaseTask):
for k in children_keys
if (ppd[year]["name"] in k and (is_data or (ppd[year]["gt"] in k)))
]
# logging for different cases
if len(usable_children_keys) == 0:
if dataset_key in self.exceptions[self.nanover]:
logging.info(f"taking exception for {original_key}")
usable_children_keys = self.exceptions[self.nanover][dataset_key]
logging.info("")
elif len(usable_children_keys) == 0:
logging.info(f"== no usable children for: {original_key} ==")
cr_time = ds["dataset"][0]["creation_time"]
two_months_ago = time.time() - 5184000
......@@ -281,9 +311,6 @@ class QueryDatasets(BaseTask):
logging.info("-> very new")
if ds["dataset"][0]["status"] == "PRODUCTION":
logging.info("-> still in production")
if dataset_key in self.exceptions[self.nanover]:
logging.info("-> taking exception")
usable_children_keys = [self.exceptions[self.nanover][dataset_key]]
logging.info("")
elif len(usable_children_keys) > 1:
logging.info(f"== many children for: {original_key} ==")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment