Skip to content

Commit

Permalink
feat : change JEC implementation
Browse files Browse the repository at this point in the history
  • Loading branch information
Ming-Yan committed Mar 20, 2024
1 parent 1c9bbc8 commit 4828510
Show file tree
Hide file tree
Showing 244 changed files with 263 additions and 10,245 deletions.
4,715 changes: 0 additions & 4,715 deletions metadata/JetHT.json

This file was deleted.

5,370 changes: 0 additions & 5,370 deletions metadata/QCD_Pt_samples.json

This file was deleted.

4 changes: 0 additions & 4 deletions metadata/test_QCD.json

This file was deleted.

4 changes: 2 additions & 2 deletions runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ def get_main_parser():
choices=[
"Rereco17_94X",
"Winter22Run3",
"Summer22Run3",
"Summer22EERun3",
"Summer22",
"Summer22EE",
"Summer23",
"Summer23BPix",
"2018_UL",
Expand Down
1 change: 1 addition & 0 deletions src/BTVNanoCommissioning/helpers/update_branch.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ def missing_branch(events):
return events


### Not used anymore
def add_jec(events, campaign, jmestuff):
dataset = events.metadata["dataset"]
jet_factory = jmestuff["jet_factory"]
Expand Down
37 changes: 25 additions & 12 deletions src/BTVNanoCommissioning/utils/AK4_parameters.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,14 @@
"JME": "jec_compiled.pkl.gz",
"jetveto": {"Run2022CD jetvetomap": "Winter22Run3_RunCD_v1.histo.root"},
},
"Summer22Run3": {
"Summer22": {
"lumiMask": "Cert_Collisions2022_355100_362760_Golden.json",
"PU": "puwei_2022_preEE.histo.root", # new PU files, based on preEE
"JME": "jec_compiled.pkl.gz", # update to latest JEC
"JME": {
"MC": "Summer22_22Sep2023_V2",
"Run2022C": "Summer22_22Sep2023_RunCD_V2",
"Run2022D": "Summer22_22Sep2023_RunCD_V2",
}, # update to latest JEC
"LSF": {
"mu_json": "ScaleFactors_Muon_trackerMuons_Z_2022_Prompt_ID_ISO_schemaV2.json",
"mu_ID": "NUM_TightID_DEN_TrackerMuons",
Expand All @@ -56,10 +60,15 @@
},
"jetveto": {"Run2022CD jetvetomap": "Winter22Run3_RunCD_v1.histo.root"},
},
"Summer22EERun3": {
"Summer22EE": {
"lumiMask": "Cert_Collisions2022_355100_362760_Golden.json",
"PU": "puwei_2022_postEE.histo.root", # new PU file, post EE
"JME": "jec_compiled.pkl.gz",
"JME": {
"MC": "Summer22EE_22Sep2023_V2",
"Run2022E": "Summer22EE_22Sep2023_RunE_V2",
"Run2022F": "Summer22EE_22Sep2023_RunF_V2",
"Run2022G": "Summer22EE_22Sep2023_RunG_V2",
},
"LSF": {
"ele_json": "electron.json.gz",
"mu_json": "ScaleFactors_Muon_trackerMuons_Z_2022EE_Prompt_ID_ISO_schemaV2.json",
Expand All @@ -79,16 +88,17 @@
"MC": "calibeHistoWrite_MC2022EE_NANO130X_v1.root",
},
},
"2018_UL": { # for QCD workflow
"lumiMask": "Cert_314472-325175_13TeV_Legacy2018_Collisions18_JSON.txt",
"PU": "puweight_2018_UL.HLTPFJet140.histo.root", # PU weights for HLT_Jet140 path
"JME": "jec_compiled.pkl.gz",
"BTV": {"deepCSV": "shape"},
},
"Summer23": {
"lumiMask": "Cert_Collisions2023_366442_370790_Golden.json",
"PU": "puwei_Summer23.histo.root",
"JME": "jec_compiled.pkl.gz",
"JME": {
"MC": "Summer23Prompt23_V1",
"Run2023C-22Sep2023_v1": "Summer23Prompt23_RunCv123_V1",
"Run2023C-22Sep2023_v2": "Summer23Prompt23_RunCv123_V1",
"Run2023C-22Sep2023_v3": "Summer23Prompt23_RunCv123_V1",
"Run2023C-22Sep2023_v4": "Summer23Prompt23_RunCv4_V1",
},
# "JME": "jec_compiled.pkl.gz",
"jetveto": {"Run2023BC jetvetomap_all": "Summer23Prompt23_RunC_v1.histo.root"},
"JPCalib": {
"Run2023C-22Sep2023_v1": "calibeHistoWrite_Data2023C-22Sep2023_v1.root",
Expand All @@ -101,7 +111,10 @@
"Summer23BPix": {
"lumiMask": "Cert_Collisions2023_366442_370790_Golden.json",
"PU": "puwei_Summer23BPix.histo.root",
# "JME": "jec_compiled.pkl.gz",
"JME": {
"MC": "Summer23BPixPrompt23_V1",
"Run2023D": "Summer23BPixPrompt23_RunD_V1",
},
"jetveto": {
"Run2023D jetvetomap_all": "Summer23BPixPrompt23_RunD_v1.histo.root"
}, # this is from Mikko https://indico.cern.ch/event/1315421/contributions/5532963/attachments/2697975/4683826/2023_08_16_jetvetomaps_v3.pdf
Expand Down
Loading

0 comments on commit 4828510

Please sign in to comment.