Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
2fc51cb
Full2024v15 studies and first corrections
BlancoFS Jun 17, 2025
c5fd521
Fix conflicts
BlancoFS Jun 18, 2025
f49c768
Re-add JEC for Data
BlancoFS Jun 18, 2025
7b1ba69
Push 22+23+24 latest updates
BlancoFS Sep 11, 2025
a3d7217
Bug fix: jet veto map application
BlancoFS Sep 23, 2025
b095ea1
Update DY LO from v2 to v3
BlancoFS Oct 1, 2025
d09f932
Final details for Summer24 production
BlancoFS Oct 3, 2025
5ad0e82
Add WJets samples
BlancoFS Oct 15, 2025
322e134
Add 2024 Wjets xs
BlancoFS Oct 16, 2025
9ba60b1
Update towards final 2024 production + CVMFS corrections
BlancoFS Oct 21, 2025
124710d
Remove v1 from EGamma corrections
BlancoFS Oct 23, 2025
57a15b9
Add new prompt-MVA WP + latest EGM scale version
BlancoFS Oct 29, 2025
59a60b2
Fix and update scale factors (module+correction)
BlancoFS Oct 30, 2025
6e45724
Bug-fix electron scale factors (Eta - range)
BlancoFS Oct 31, 2025
88fe2e0
Propagate lepton WP to Full Run III
BlancoFS Nov 4, 2025
4d215b5
Fix wrong version in Summer22 MC
BlancoFS Nov 11, 2025
3ca75c9
JER first, then Type-1 MET corrections
BlancoFS Nov 11, 2025
9416cb7
Modify fake selection
BlancoFS Nov 12, 2025
0722655
JetVetoMap made default
BlancoFS Nov 13, 2025
ffe70ef
Bugfix electron scale factor uncertainty
BlancoFS Nov 14, 2025
1672098
Merge branch 'master' into Sergio-ifca-2024
NTrevisani Nov 14, 2025
115393d
Fix muon PNet WP + new scale factors
BlancoFS Nov 18, 2025
e358b60
Merge branch 'Sergio-ifca-2024' of github.com:latinos/mkShapesRDF int…
BlancoFS Nov 18, 2025
79af8dc
Final updates for 22, 23, and 24 productions
BlancoFS Nov 18, 2025
fdae812
[JMECalculator] Add option to do not correct non-matched jets in the …
BlancoFS Nov 20, 2025
8bacb56
Revert changes + update jet smearing
BlancoFS Nov 20, 2025
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
8 changes: 3 additions & 5 deletions 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 Expand Up @@ -72,10 +72,8 @@ cat <<EOF > start.sh
#!/bin/bash
$sourceCommand
source `pwd`/myenv/bin/activate
export STARTPATH=`pwd`/start.sh
export JAVA_HOME=/cvmfs/sft.cern.ch/lcg/releases/java/11.0.21p9-cabd2/x86_64-el9-gcc13-opt
export PATH=\$JAVA_HOME/bin:\$PATH
export PYTHONPATH=`pwd`/myenv/lib64/python3.9/site-packages:\$PYTHONPATH
export STARTPATH=`pwd`/start.sh
export PYTHONPATH=`pwd`/myenv/lib64/python3.11/site-packages:\$PYTHONPATH

Choose a reason for hiding this comment

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

I don't know if this is still the case but we added a couple of lines here since people had problems getting their voms certificate while inside di env. Maybe is worth checking, you didn't have any problem?

Copy link
Author

Choose a reason for hiding this comment

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

I think that was an issue related to an updated software in the recent LCG machines. It should be fixed now without the need to touch anything there. In fact, I can activate voms now without any trouble.

export PATH=`pwd`/utils/bin:\$PATH
EOF

Expand Down
63 changes: 43 additions & 20 deletions mkShapesRDF/processor/data/JetMaker_cfg.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,39 +4,62 @@
frameworkPath = getFrameworkPath() + "mkShapesRDF"
JetMakerCfg = {
'Full2022v12': {
"vetomap": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2022_Summer22/jetvetomaps.json.gz",
"vetomap": "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-22CDSep23-Summer22-NanoAODv12/latest/jetvetomaps.json.gz",
"vetokey": "Summer22_23Sep2023_RunCD_V1",
"JEC": "Summer22_22Sep2023_V2_MC",
"JEC_data" : "Summer22_22Sep2023_RunCD_V2_DATA",
"JEC": "Summer22_22Sep2023_V3_MC",
"JEC_data" : "Summer22_22Sep2023_RunCD_V3_DATA",
"JER": "Summer22_22Sep2023_JRV1_MC",
"jet_jerc" : frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2022_Summer22/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/jer_smear.json.gz",
"jet_jerc" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-22CDSep23-Summer22-NanoAODv12/latest/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jer_smear/jer_smear_run3.json.gz",
"met_xy_json" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-22EFGSep23-Summer22EE-NanoAODv12/latest/met_xyCorrections_2022_2022EE.json.gz",
"met_xy_era" : "2022"
},
'Full2022EEv12': {
"vetomap": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2022_Summer22EE/jetvetomaps.json.gz",
"vetomap": "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-22EFGSep23-Summer22EE-NanoAODv12/latest/jetvetomaps.json.gz",
"vetokey": "Summer22EE_23Sep2023_RunEFG_V1",
"JEC": "Summer22EE_22Sep2023_V2_MC",
"JEC_data" : ["Summer22EE_22Sep2023_RunE_V2_DATA", 'Summer22EE_22Sep2023_RunF_V2_DATA', 'Summer22EE_22Sep2023_RunG_V2_DATA'],
"JEC": "Summer22EE_22Sep2023_V3_MC",
"JEC_data" : ["Summer22EE_22Sep2023_RunE_V3_DATA", 'Summer22EE_22Sep2023_RunF_V3_DATA', 'Summer22EE_22Sep2023_RunG_V3_DATA'],
"JER": "Summer22EE_22Sep2023_JRV1_MC",
"jet_jerc" : frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2022_Summer22EE/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/jer_smear.json.gz",
"jet_jerc" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-22EFGSep23-Summer22EE-NanoAODv12/latest/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jer_smear/jer_smear_run3.json.gz",
"met_xy_json" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-22EFGSep23-Summer22EE-NanoAODv12/latest/met_xyCorrections_2022_2022EE.json.gz",
"met_xy_era" : "2022EE"
},
'Full2023v12': {
"vetomap": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2023_Summer23/jetvetomaps.json.gz",
"vetomap": "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-23CSep23-Summer23-NanoAODv12/latest/jetvetomaps.json.gz",
"vetokey": "Summer23Prompt23_RunC_V1",
"JEC": "Summer23Prompt23_V1_MC",
"JEC_data" : ["Summer23Prompt23_RunCv123_V1_DATA", "Summer23Prompt23_RunCv4_V1_DATA"],
"JEC": "Summer23Prompt23_V2_MC",
#"JEC_data" : ["Summer23Prompt23_RunCv123_V1_DATA", "Summer23Prompt23_RunCv4_V1_DATA"],
"JEC_data" : ["Summer23Prompt23_V2_DATA", "Summer23Prompt23_V2_DATA"],
"JER": "Summer23Prompt23_RunCv1234_JRV1_MC",
"jet_jerc" : frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2023_Summer23/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/jer_smear.json.gz",
"jet_jerc" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-23CSep23-Summer23-NanoAODv12/latest/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jer_smear/jer_smear_run3.json.gz",
"met_xy_json" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-23DSep23-Summer23BPix-NanoAODv12/latest/met_xyCorrections_2023_2023BPix.json.gz",
"met_xy_era" : "2023"
},
'Full2023BPixv12': {
"vetomap": frameworkPath + "/processor/data/jsonpog-integration/POG/JME/2023_Summer23BPix/jetvetomaps.json.gz",
"vetomap": "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-23DSep23-Summer23BPix-NanoAODv12/latest/jetvetomaps.json.gz",
"vetokey": "Summer23BPixPrompt23_RunD_V1",
"JEC": "Summer23BPixPrompt23_V1_MC",
"JEC_data" : "Summer23BPixPrompt23_RunD_V1_DATA",
"JEC": "Summer23BPixPrompt23_V3_MC",
"JEC_data" : "Summer23BPixPrompt23_V3_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",
"jet_jerc" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-23DSep23-Summer23BPix-NanoAODv12/latest/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jer_smear/jer_smear_run3.json.gz",
"met_xy_json" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-23DSep23-Summer23BPix-NanoAODv12/latest/met_xyCorrections_2023_2023BPix.json.gz",
"met_xy_era" : "2023BPix"
},
'Full2024v15': {
"vetomap": "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-24CDEReprocessingFGHIPrompt-Summer24-NanoAODv15/latest/jetvetomaps.json.gz",
"vetokey": "Summer24Prompt24_RunBCDEFGHI_V1",
"JEC": "Summer24Prompt24_V1_MC",
"JEC_data" : "Summer24Prompt24_V1_DATA",
"JER": "Summer23BPixPrompt23_RunD_JRV1_MC",
"jet_jerc" : "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-24CDEReprocessingFGHIPrompt-Summer24-NanoAODv15/latest/jet_jerc.json.gz",
"jer_smear": frameworkPath + "/processor/data/jer_smear/jer_smear_run3.json.gz",
"jetId": {
"json": "/cvmfs/cms-griddata.cern.ch/cat/metadata/JME/Run3-24CDEReprocessingFGHIPrompt-Summer24-NanoAODv15/latest/jetid.json.gz",
"key" : "AK4PUPPI_Tight",
}
},
}

Loading