Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/rkansal47/HHbbVV
Browse files Browse the repository at this point in the history
  • Loading branch information
@rkansal47
rkansal47 committed Mar 6, 2024
2 parents 88abdbd + 57c2968 commit 7b62a0c
Show file tree
Hide file tree
Showing 10 changed files with 6,803 additions and 72 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ python -W ignore src/run.py --processor skimmer --year 2017 --files $FILE --file
Jobs

```bash
nohup python src/condor/submit_from_yaml.py --year 2017 --tag $TAG --processor skimmer --save-systematics --submit --yaml src/condor/submit_configs/skimmer_inputs_23_02_17.yaml &> tmp/submitout.txt &
nohup python src/condor/submit_from_yaml.py --year 2018 --tag $TAG --processor skimmer --git-branch main --submit --yaml src/condor/submit_configs/skimmer_inputs_24_02_26.yaml &> tmp/submitout.txt &
```

All years:
Expand Down
18 changes: 11 additions & 7 deletions data/indexpfnano.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,16 @@ def get_subfolders(parent):

folders_to_index = [
#
# "/store/user/lpcpfnano/rkansal/v2_3/2016/SingleMu2016",
# "/store/user/lpcpfnano/rkansal/v2_3/2017/SingleMu2017",
"/store/user/lpcpfnano/rkansal/v2_3/2016/SingleMu2016",
"/store/user/lpcpfnano/rkansal/v2_3/2017/SingleMu2017",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018",
#
"/store/user/lpcpfnano/cmantill/v2_3/2016/JetHT2016",
"/store/user/lpcpfnano/cmantill/v2_3/2017/JetHT2017",
"/store/user/lpcpfnano/cmantill/v2_3/2018/JetHT2018",
"/store/user/lpcpfnano/rkansal/v2_3/2016/JetHT2016",
"/store/user/lpcpfnano/rkansal/v2_3/2017/JetHT2017",
"/store/user/lpcpfnano/rkansal/v2_3/2018/JetHT2018",
#
"/store/user/lpcpfnano/cmantill/v2_3/2016/TTbar",
"/store/user/lpcpfnano/cmantill/v2_3/2016APV/TTbar",
Expand Down Expand Up @@ -98,7 +101,8 @@ def get_subfolders(parent):
"/store/user/lpcpfnano/rkansal/v2_3/2016APV/GluGluHToBB/",
"/store/user/lpcpfnano/rkansal/v2_3/2017/GluGluHToBB/",
"/store/user/lpcpfnano/rkansal/v2_3/2018/GluGluHToBB/",
"/store/user/lpcpfnano/cmantill/v2_3/2016/HToBB/"
#
"/store/user/lpcpfnano/cmantill/v2_3/2016/HToBB/",
"/store/user/lpcpfnano/cmantill/v2_3/2016APV/HToBB/",
"/store/user/lpcpfnano/cmantill/v2_3/2017/HToBB/",
"/store/user/lpcpfnano/cmantill/v2_3/2018/HToBB/",
Expand Down Expand Up @@ -129,11 +133,11 @@ def get_subfolders(parent):
"/store/user/lpcpfnano/cmantill/v2_3/2018/SingleTop/ST_t-channel_top_4f_InclusiveDecays_TuneCP5_13TeV-powheg-madspin-pythia8/ST_t-channel_top_4f_InclusiveDecays/220808_150919/0000/nano_mc2018_17.root"
]

ignore_subsamples = ["SingleMuon_Run2016B_ver1_HIPM"]
# ignore_subsamples = ["SingleMuon_Run2016B_ver1_HIPM"]
ignore_subsamples = []

for pyear in ["2016", "2016APV", "2017", "2018"]:
# if pyear != "2018":
# continue
# for pyear in ["2016", "2016APV", "2017", "2018"]:
for pyear in ["2016", "2016APV"]:
print(pyear)
index = {}
for f1 in folders_to_index:
Expand Down
1,181 changes: 1,180 additions & 1 deletion data/pfnanoindex_2016.json
View file

Large diffs are not rendered by default.

1,867 changes: 1,866 additions & 1 deletion data/pfnanoindex_2016APV.json
View file

Large diffs are not rendered by default.

3,660 changes: 3,659 additions & 1 deletion data/pfnanoindex_2017.json
View file

Large diffs are not rendered by default.

23 changes: 20 additions & 3 deletions data/pfnanoindex_2018.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16474,7 +16474,21 @@
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/231003_225438/0000/nano_data2018_96.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/231003_225438/0000/nano_data2018_97.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/231003_225438/0000/nano_data2018_98.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/231003_225438/0000/nano_data2018_99.root"
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/231003_225438/0000/nano_data2018_99.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-1.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-10.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-11.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-12.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-13.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-14.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-15.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-2.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-3.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-4.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-5.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-7.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-8.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018A_GT36-v2/240303_182406/0000/nano_data2018_1-9.root"
],
"SingleMuon_Run2018B": [
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018B/230610_145928/0000/nano_data2018_1-1.root",
Expand Down Expand Up @@ -18059,7 +18073,8 @@
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018C_GT36-v2/231003_225506/0000/nano_data2018_96.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018C_GT36-v2/231003_225506/0000/nano_data2018_97.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018C_GT36-v2/231003_225506/0000/nano_data2018_98.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018C_GT36-v2/231003_225506/0000/nano_data2018_99.root"
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018C_GT36-v2/231003_225506/0000/nano_data2018_99.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018C_GT36-v2/240303_182433/0000/nano_data2018_1-2.root"
],
"SingleMuon_Run2018D": [
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D/230610_145950/0000/nano_data2018_1-1.root",
Expand Down Expand Up @@ -22549,7 +22564,9 @@
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/231003_225251/0000/nano_data2018_96.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/231003_225251/0000/nano_data2018_97.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/231003_225251/0000/nano_data2018_98.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/231003_225251/0000/nano_data2018_99.root"
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/231003_225251/0000/nano_data2018_99.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/240303_182529/0000/nano_data2018_1.root",
"/store/user/lpcpfnano/rkansal/v2_3/2018/SingleMu2018/SingleMuon/SingleMuon_Run2018D_GT36-v2/240303_182529/0000/nano_data2018_2.root"
]
},
"SingleTop": {
Expand Down
24 changes: 12 additions & 12 deletions src/HHbbVV/bash/run_local.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@
# done


year=2017
year=2016APV
processor=skimmer
extraargs=""
extraargs="--maxchunks 20000"
# extraargs="--no-inference"

OUTPUTDIR="tmp/test_outputs/$year"
mkdir -p $OUTPUTDIR

python -W ignore src/run.py --processor $processor --year $year --samples HH --subsamples GluGluToHHTobbVV_node_cHHH1 --save-systematics --starti 0 --endi 1 $extraargs
label="GluGluToHHTobbVV_node_cHHH1"
mkdir -p $OUTPUTDIR/$label/parquet $OUTPUTDIR/$label/pickles
mv "0-1.parquet" $OUTPUTDIR/$label/parquet/
mv "outfiles/0-1.pkl" $OUTPUTDIR/$label/pickles/
# python -W ignore src/run.py --processor $processor --year $year --samples HH --subsamples GluGluToHHTobbVV_node_cHHH1 --save-systematics --starti 0 --endi 1 $extraargs
# label="GluGluToHHTobbVV_node_cHHH1"
# mkdir -p $OUTPUTDIR/$label/parquet $OUTPUTDIR/$label/pickles
# mv "0-1.parquet" $OUTPUTDIR/$label/parquet/
# mv "outfiles/0-1.pkl" $OUTPUTDIR/$label/pickles/

# python -W ignore src/run.py --processor $processor --year $year --samples XHY --subsamples NMSSM_XToYHTo2W2BTo4Q2B_MX-3000_MY-250 --save-systematics --starti 0 --endi 1 $extraargs
# label="NMSSM_XToYHTo2W2BTo4Q2B_MX-3000_MY-250"
Expand All @@ -41,8 +41,8 @@ mv "outfiles/0-1.pkl" $OUTPUTDIR/$label/pickles/
# mv "0-1.parquet" $OUTPUTDIR/$label/parquet/
# mv "outfiles/0-1.pkl" $OUTPUTDIR/$label/pickles/

# python -W ignore src/run.py --processor $processor --year $year --samples "JetHT$year" --subsamples "JetHT_Run${year}D" --save-systematics --starti 0 --endi 1 $extraargs
# label="JetHT_Run${year}D"
# mkdir -p $OUTPUTDIR/$label/parquet $OUTPUTDIR/$label/pickles
# mv "0-1.parquet" $OUTPUTDIR/$label/parquet/
# mv "outfiles/0-1.pkl" $OUTPUTDIR/$label/pickles/
python -W ignore src/run.py --processor $processor --year $year --samples "JetHT2016" --subsamples "JetHT_Run2016D_HIPM" --save-systematics --starti 0 --endi 1 $extraargs
label="JetHT_Run${year}D"
mkdir -p $OUTPUTDIR/$label/parquet $OUTPUTDIR/$label/pickles
mv "0-1.parquet" $OUTPUTDIR/$label/parquet/
mv "outfiles/0-1.pkl" $OUTPUTDIR/$label/pickles/
2 changes: 1 addition & 1 deletion src/HHbbVV/processors/bbVVSkimmer.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ def process(self, events: ak.Array):

metfilters = np.ones(len(events), dtype="bool")
metfilterkey = "data" if isData else "mc"
for mf in self.metfilters[year][metfilterkey]:
for mf in self.metfilters[year[:4]][metfilterkey]:
if mf in events.Flag.fields:
metfilters = metfilters & events.Flag[mf]

Expand Down
36 changes: 22 additions & 14 deletions src/condor/check_jobs.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,36 @@
trigger_processor = args.processor.startswith("trigger")

eosdir = f"/eos/uscms/store/user/{args.user}/bbVV/{args.processor}/{args.tag}/{args.year}/"
user_condor_dir = f"/uscms/home/{args.user}/nobackup/HHbbVV/condor/"

samples = listdir(eosdir)
jdls = [
jdl
for jdl in listdir(
f"/uscms/home/{args.user}/nobackup/HHbbVV/condor/{args.processor}/{args.tag}/"
)
for jdl in listdir(f"{user_condor_dir}/{args.processor}/{args.tag}/")
if jdl.endswith(".jdl")
]

jdl_dict = {
sample: np.sort(
# get the highest numbered .jdl file to know how many output files there should be
jdl_dict = {}
for sample in samples.copy():
sorted_jdls = np.sort(
[
int(jdl[:-4].split("_")[-1])
for jdl in jdls
if jdl.split("_")[0] == args.year and "_".join(jdl.split("_")[1:-1]) == sample
]
)[-1]
+ 1
for sample in samples
}
)

if len(sorted_jdls):
jdl_dict[sample] = sorted_jdls[-1] + 1
else:
# if for some reason a folder exists in EOS but no .jdl file
samples.remove(sample)


running_jobs = []
if args.check_running:
os.system("condor_q | awk '{print $9}' > running_jobs.txt")
os.system(f"condor_q {args.user}" "| awk '{print $9}' > running_jobs.txt")
with Path("running_jobs.txt").open() as f:
lines = f.readlines()

Expand All @@ -81,8 +85,10 @@
print(f"Job #{i} for sample {sample} is running.")
continue

jdl_file = f"condor/{args.processor}/{args.tag}/{args.year}_{sample}_{i}.jdl"
err_file = f"condor/{args.processor}/{args.tag}/logs/{args.year}_{sample}_{i}.err"
jdl_file = (
f"{user_condor_dir}/{args.processor}/{args.tag}/{args.year}_{sample}_{i}.jdl"
)
err_file = f"{user_condor_dir}/{args.processor}/{args.tag}/logs/{args.year}_{sample}_{i}.err"
print(jdl_file)
missing_files.append(jdl_file)
err_files.append(err_file)
Expand Down Expand Up @@ -114,8 +120,10 @@
continue

print_red(f"Missing output pickle #{i} for sample {sample}")
jdl_file = f"condor/{args.processor}/{args.tag}/{args.year}_{sample}_{i}.jdl"
err_file = f"condor/{args.processor}/{args.tag}/logs/{args.year}_{sample}_{i}.err"
jdl_file = f"{user_condor_dir}/{args.processor}/{args.tag}/{args.year}_{sample}_{i}.jdl"
err_file = (
f"{user_condor_dir}/{args.processor}/{args.tag}/logs/{args.year}_{sample}_{i}.err"
)
missing_files.append(jdl_file)
err_files.append(err_file)
if args.submit_missing:
Expand Down
62 changes: 31 additions & 31 deletions src/condor/submit_configs/skimmer_inputs_24_02_26.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{ "Skimmer": {
# submit script will append year to this
"JetHT": { "files_per_job": 20, "chunksize": 80000 },
# "HH":
# {
# "subsamples":
# [
# "GluGluToHHTobbVV_node_cHHH0",
# "GluGluToHHTobbVV_node_cHHH1",
# "GluGluToHHTobbVV_node_cHHH2p45",
# "GluGluToHHTobbVV_node_cHHH5",
# "VBF_HHTobbVV_CV_1_C2V_1_C3_1",
# "VBF_HHTobbVV_CV_0_5_C2V_1_C3_1",
# "VBF_HHTobbVV_CV_1_C2V_0_C3_1",
# "VBF_HHTobbVV_CV_1_C2V_2_C3_1",
# "VBF_HHTobbVV_CV_1_5_C2V_1_C3_1",
# "VBF_HHTobbVV_CV_1_C2V_1_C3_0",
# "VBF_HHTobbVV_CV_1_C2V_1_C3_2",
# ],
# "files_per_job": 8,
# "chunksize": 10000,
# },
# "XHY":
# {
# "subsamples":
# [
# "NMSSM_XToYHTo2W2BTo4Q2B_MX-900_MY-80",
# "NMSSM_XToYHTo2W2BTo4Q2B_MX-1200_MY-190",
# "NMSSM_XToYHTo2W2BTo4Q2B_MX-2000_MY-125",
# "NMSSM_XToYHTo2W2BTo4Q2B_MX-3000_MY-250",
# "NMSSM_XToYHTo2W2BTo4Q2B_MX-4000_MY-150",
# ],
# "files_per_job": 20,
# },
"HH":
{
"subsamples":
[
"GluGluToHHTobbVV_node_cHHH0",
"GluGluToHHTobbVV_node_cHHH1",
"GluGluToHHTobbVV_node_cHHH2p45",
"GluGluToHHTobbVV_node_cHHH5",
"VBF_HHTobbVV_CV_1_C2V_1_C3_1",
"VBF_HHTobbVV_CV_0_5_C2V_1_C3_1",
"VBF_HHTobbVV_CV_1_C2V_0_C3_1",
"VBF_HHTobbVV_CV_1_C2V_2_C3_1",
"VBF_HHTobbVV_CV_1_5_C2V_1_C3_1",
"VBF_HHTobbVV_CV_1_C2V_1_C3_0",
"VBF_HHTobbVV_CV_1_C2V_1_C3_2",
],
"files_per_job": 8,
"chunksize": 10000,
},
"XHY":
{
"subsamples":
[
"NMSSM_XToYHTo2W2BTo4Q2B_MX-900_MY-80",
"NMSSM_XToYHTo2W2BTo4Q2B_MX-1200_MY-190",
"NMSSM_XToYHTo2W2BTo4Q2B_MX-2000_MY-125",
"NMSSM_XToYHTo2W2BTo4Q2B_MX-3000_MY-250",
"NMSSM_XToYHTo2W2BTo4Q2B_MX-4000_MY-150",
],
"files_per_job": 20,
},
"QCD":
{
"files_per_job": 20,
Expand Down

0 comments on commit 7b62a0c

Please sign in to comment.