Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ if [ -z "$1" ]; then
sourceCommand="$sourceCommand""; source /cvmfs/sft.cern.ch/lcg/views/LCG_105/x86_64-centos7-gcc11-opt/setup.sh"
elif [[ "$OS" == *"linux:9"* ]]; then
echo el9
sourceCommand="$sourceCommand""; source /cvmfs/sft.cern.ch/lcg/views/LCG_105/x86_64-el9-gcc11-opt/setup.sh"
sourceCommand="$sourceCommand""; source /cvmfs/sft.cern.ch/lcg/views/LCG_107/x86_64-el9-gcc11-opt/setup.sh"
else
echo "$OS"" not supported"
exit 1
Expand Down
15 changes: 14 additions & 1 deletion mkShapesRDF/processor/data/JetMaker_cfg.py

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess everywhere now we can change from winter24 to summer24

Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,23 @@
'Full2023BPixv12': {
"vetomap": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2023_Summer23BPix/jetvetomaps.json.gz",
"vetokey": "Summer23BPixPrompt23_RunD_V1",
"JEC": "Summer23BPixPrompt23_V1_MC",
"JEC": "Summer23BPixPrompt23_V1_MC",
"JEC_data" : "Summer23BPixPrompt23_RunD_V1_DATA",
"JER": "Summer23BPixPrompt23_RunD_JRV1_MC",
"jet_jerc" : frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2023_Summer23BPix/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/jer_smear.json.gz",
},
'Full2024v15': {
"vetomap": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2024_Winter24/jetvetomaps.json.gz",
"vetokey": "Winter24Prompt2024BCDEFGHI_V1",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change key to Summer24Prompt24_RunBCDEFGHI_V1

"JEC": "Winter24Prompt24_V3_MC",

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @BlancoFS , this key now should be changed to the newest version: Summer24Prompt24_V1, if I am not mistaken. Also, why are we not using JEC for data like the other eras?

"JER": "Summer23BPixPrompt23_RunD_JRV1_MC",
"jet_jerc" : frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2024_Winter24/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/jer_smear.json.gz",
"jetId": {
"json": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2024_Summer24/jetid.json.gz",
"key" : "AK4PUPPI_Tight",
}
},
}

78 changes: 44 additions & 34 deletions mkShapesRDF/processor/data/LeptonSel_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -592,9 +592,9 @@
#'tkSF': {
# '1-1' : ["2024XXXX", "Electron-ID-SF", "data/jsonpog-integration/POG/EGM/2023_Summer24/electron.json.gz"]
#} ,
#'wpSF': {
# '1-1' : ["2024XXXX", "Electron-ID-SF", "passingMVA90", 'data/scale_factor/Full2024v15/electron.json'],
#} ,
'wpSF': {
'1-1' : ["2024PromptCDE+Re-recoFGHI", "Electron-ID-SF", "passingMVA90", 'data/scale_factor/Full2024v15/electron.json'],
} ,
#'fakeW' : 'data/fake_prompt_rates/',
},
"mvaWinter22V2Iso_WP90": {
Expand All @@ -617,9 +617,9 @@
#'tkSF': {
# '1-1' : ["2024XXXX", "Electron-ID-SF", "data/jsonpog-integration/POG/EGM/2023_Summer24/electron.json.gz"]
#}
#'wpSF': {
# '1-1' : ["2024XXXX", "Electron-ID-SF", "passingMVA90_HWW", 'data/scale_factor/Full2024v15/electron.json'],
#} ,
'wpSF': {
'1-1' : ["2024PromptCDE+Re-recoFGHI", "Electron-ID-SF", "passingMVA90_HWW", 'data/scale_factor/Full2024v15/electron.json'],
} ,
#'fakeW' : 'data/fake_prompt_rates/',
},
"cutBased__LooseID_tthMVA_Run3": {
Expand All @@ -642,9 +642,9 @@
#'tkSF': {
# '1-1' : ["2024XXXX", "Electron-ID-SF", "data/jsonpog-integration/POG/EGM/2023_Summer24/electron.json.gz"]
#}
#'wpSF': {
# '1-1' : ["2024XXXX", "Electron-ID-SF", "passingTTHMVA", 'data/scale_factor/Full2024v15/electron.json'],
#} ,
'wpSF': {
'1-1' : ["2024PromptCDE+Re-recoFGHI", "Electron-ID-SF", "passingTTHMVA", 'data/scale_factor/Full2024v15/electron.json'],
} ,
#'fakeW' : 'data/fake_prompt_rates/',
},
},
Expand Down Expand Up @@ -1342,12 +1342,12 @@
"ROOT::VecOps::abs(Muon_dxy) < 0.02",
],
},
#"idSF": {
# "1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
#"isoSF": {
# "1-1": ["NUM_TightPFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
"idSF": {
"1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"isoSF": {
"1-1": ["NUM_TightPFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
#"fakeW": "data/fake_prompt_rates/Full2024v15/cut_Tight_HWW/",
},
"cut_TightID_pfIsoTight_HWW_tthmva_67": {
Expand All @@ -1366,15 +1366,15 @@
"ROOT::VecOps::abs(Muon_dxy) < 0.02",
],
},
#"idSF": {
# "1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
#"isoSF": {
# "1-1": ["NUM_TightPFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
#"tthSF": {
# "1-1": ["NUM_TightID_HWW_TightIso_tthMVA_DEN_TightPFIso", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
"idSF": {
"1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"isoSF": {
"1-1": ["NUM_TightPFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"tthSF": {
"1-1": ["NUM_TightID_HWW_TightIso_tthMVA_DEN_TightPFIso", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
#"fakeW": "data/fake_prompt_rates/Full2024v15/cut_TightID_HWW_TightPFIso_tthMVA/",
},
"cut_TightID_pfIsoLoose_HWW_tthmva_67": {
Expand All @@ -1393,16 +1393,16 @@
"ROOT::VecOps::abs(Muon_dxy) < 0.02",
],
},
#"idSF": {
# "1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
#"isoSF": {
# "1-1": ["NUM_LoosePFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
#"tthSF": {
# "1-1": ["NUM_TightID_HWW_LooseIso_tthMVA_DEN_LoosePFIso", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
#},
#"fakeW": "data/fake_prompt_rates/Full2024v15/cut_TightID_HWW_LoosePFIso_tthMVA/",
"idSF": {
"1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"isoSF": {
"1-1": ["NUM_LoosePFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"tthSF": {
"1-1": ["NUM_TightID_HWW_LooseIso_tthMVA_DEN_LoosePFIso", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
#"fakeW": "data/fake_prompt_rates/Full2024v15/cut_TightID_HWW_LoosePFIso_tthMVA/",
},
"cut_TightID_pfIsoLoose_HWW_PNet": {
"cuts": {
Expand All @@ -1421,6 +1421,16 @@
"Muon_pnScore_prompt > 0.6",
],
},
"idSF": {
"1-1": ["NUM_TightID_HWW_DEN_TrackerMuons", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"isoSF": {
"1-1": ["NUM_LoosePFIso_DEN_TightID_HWW", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
"tthSF": {
"1-1": ["NUM_TightID_HWW_LooseIso_PNet_DEN_LoosePFIso", "data/scale_factor/Full2024v15/muonSF_latinos_HWW.json"],
},
#"fakeW": "data/fake_prompt_rates/Full2024v15/cut_TightID_HWW_LoosePFIso_PNet/",
},
},
},
Expand Down
Loading