Add upar t reg 2024/2025 jme

configs/jme/.sites_map.json

@@ -1 +1 @@
-{"T0_CH_CERN_Disk": {"/+store/t0streamer/(.*)": "root://eoscms.cern.ch//eos/cms/store/t0streamer/$1?eos.app=cmst0", "/+store/(.*)": "root://eoscms.cern.ch//eos/cms/tier0/store/$1?eos.app=cmst0"}, "T1_DE_KIT_Disk": "root://cmsdcache-kit-disk.gridka.de:1094/", "T1_ES_PIC_Disk": "root://xrootd-cmst1-door.pic.es:1094//pnfs/pic.es/data/cms/disk", "T1_FR_CCIN2P3_Disk": "root://ccxrdcms.in2p3.fr:1094/", "T1_IT_CNAF_Disk": "root://xrootd-cms.infn.it:1194/", "T1_RU_JINR_Disk": "root://xrootd01.jinr-t1.ru:1094//pnfs/jinr-t1.ru/data/cms", "T1_UK_RAL_Disk": "root://rdr.echo.stfc.ac.uk/", "T1_US_FNAL_Disk": {"/+store/temp/user/(.*)": "root://cmseos.fnal.gov//eos/uscms/store/temp/user/$1", "/+store/(.*)": "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/$1"}, "T2_AT_Vienna": "root://eos.grid.vbc.ac.at:1094//eos/vbc/experiments/cms", "T2_BE_IIHE": {"/+(.*)": "root://maite.iihe.ac.be:1095//$1"}, "T2_BR_SPRACE": "root://osg-se.sprace.org.br:1094/", "T2_BR_UERJ": "root://xrootd2.hepgrid.uerj.br:1094/", "T2_CH_CERN": "root://eoscms.cern.ch//eos/cms", "T2_CH_CSCS": "root://storage01.lcg.cscs.ch:1096//pnfs/lcg.cscs.ch/cms/trivcat", "T2_CN_Beijing": "root://cceos.ihep.ac.cn:1094//eos/ihep/cms", "T2_DE_DESY": {"/+(.*)": "root://dcache-cms-xrootd.desy.de:1094//$1"}, "T2_DE_RWTH": "root://grid-cms-xrootd.physik.rwth-aachen.de:1094/", "T2_EE_Estonia": "root://xrootd.hep.kbfi.ee:1094/", "T2_ES_CIEMAT": "root://gaexrdoor.ciemat.es:1094/", "T2_ES_IFCA": "root://gridftp.ifca.es/", "T2_FI_HIP": "root://hip-cms-se.csc.fi:1094/", "T2_FR_IPHC": "root://sbgdcache.in2p3.fr/", "T2_HU_Budapest": "root://grid143.kfki.hu:1094/", "T2_IN_TIFR": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T2_IT_Legnaro": "root://t2-xrdcms.lnl.infn.it:7070/", "T2_KR_KISTI": "root://cms-t2-se01.sdfarm.kr:1094/", "T2_PK_NCP": "root://pcncp22.ncp.edu.pk:1094//dpm/ncp.edu.pk/home/cms", "T2_PL_Swierk": "root://se.cis.gov.pl:1094//grid/cms", "T2_PT_NCG_Lisbon": "root://xroot02.ncg.ingrid.pt:1094/", "T2_RU_IHEP": "root://dp0015.m45.ihep.su:1094/", "T2_RU_INR": "root://grse001.inr.troitsk.ru:1094/", "T2_RU_ITEP": "root://se3.itep.ru/", "T2_RU_JINR": "root://lcgsedr01.jinr.ru:1094//pnfs/jinr.ru/data/cms", "T2_TR_METU": "root://eymir.grid.metu.edu.tr//dpm/grid.metu.edu.tr/home/cms", "T2_TW_NCHC": "root://se01.grid.nchc.org.tw//cms", "T2_UA_KIPT": "root://cms-se0.kipt.kharkov.ua//dpm/kipt.kharkov.ua/home/cms", "T2_UK_London_Brunel": "root://xrootdgw.brunel.ac.uk:1094/", "T2_UK_London_IC": "root://gfe02.grid.hep.ph.ic.ac.uk:1094//pnfs/hep.ph.ic.ac.uk/data/cms", "T2_UK_SGrid_Bristol": "root://xrootd.phy.bris.ac.uk:1094//xrootd/cms", "T2_UK_SGrid_RALPP": "root://mover.pp.rl.ac.uk:1094/pnfs/pp.rl.ac.uk/data/cms", "T2_US_Caltech": "root://k8s-redir.ultralight.org:1094/", "T2_US_Florida": "root://cmsio2.rc.ufl.edu:1094/", "T2_US_MIT": "root://xrootd.cmsaf.mit.edu:1094/", "T2_US_Nebraska": "root://xrootd-local.unl.edu:1094/", "T2_US_Purdue": "root://eos.cms.rcac.purdue.edu/", "T2_US_UCSD": "root://redirector.t2.ucsd.edu:1095/", "T2_US_Vanderbilt": "root://xrootd-vanderbilt.sites.opensciencegrid.org:1094/", "T2_US_Wisconsin": "root://cmsxrootd.hep.wisc.edu:1094/", "T3_BG_UNI_SOFIA": "root://se01.grid.uni-sofia.bg:1094//dpm/grid.uni-sofia.bg/home/cms", "T3_BY_NCPHEP": "root://grid05.hep.by//cms", "T3_CH_CERN_OpenData": {"/+store/data/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1", "/+store/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1"}, "T3_CH_PSI": "root://t3se01.psi.ch:1094/", "T3_HU_Debrecen": "root://dpm.grid.atomki.hu/", "T3_IN_TIFRCloud": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T3_IN_VBU": "root://storage.vb-ehep.in//dpm/vb-ehep.in/home/cms", "T3_IR_IPM": "root://se1.hep.ipm.ir/data", "T3_IT_Perugia": "root://cream-bdii.pg.infn.it//storage/cms", "T3_IT_Trieste": "root://cmsxrd.ts.infn.it:1094/", "T3_KR_KISTI": "root://cms-xrdr.sdfarm.kr:1094//xrd", "T3_KR_KNU": "root://cluster142.knu.ac.kr:1094/", "T3_KR_UOS": "root://cms.sscc.uos.ac.kr:1094/", "T3_MX_Cinvestav": "root://proton.fis.cinvestav.mx/", "T3_RU_MEPhI": "root://cms.lxfarm.mephi.ru//lustre/cms/phedex", "T3_US_Baylor": "root://kodiak-se.baylor.edu:1094/", "T3_US_Brown": "root://pbrux30cit.hep.brown.edu:1094/", "T3_US_Colorado": "root://hepxrd01-colorado.sites.opensciencegrid.org:1094/", "T3_US_FNALLPC": "root://cmseos.fnal.gov//eos/uscms", "T3_US_MIT": "root://submit50.mit.edu:1094/", "T3_US_NotreDame": "root://hactar01.crc.nd.edu/", "T3_US_OSG_SoCal_Cache": "root://xcache.ultralight.org:3040/", "T3_US_PuertoRico": "root://cms-se.hep.uprm.edu/", "T3_US_Rice": "root://bonner04.rice.edu:1094/", "T3_US_Rutgers": "root://ruhex-osgce.rutgers.edu/", "T3_US_UMD": "root://hepcms-se2.umd.edu:1094/", "T3_US_UMiss": "root://umiss005.hep.olemiss.edu:1094//cms/", "T3_US_VC3_NotreDame": "root://deepthought.crc.nd.edu/", "T3_US_CMU": "root://cmsdata.phys.cmu.edu/", "T3_IT_MIB": "root://storm.mib.infn.it:1094/", "T3_CH_CERNBOX": {"/+store/user/(.)(.*)": "root://eosuser.cern.ch//eos/user/$1/$1$2"}, "T3_CY_UCY": "root://heptaur2.ucy.ac.cy:1094/", "T2_PL_Cyfronet": "root://se02.grid.cyfronet.pl:11001//dpm/grid.cyfronet.pl/home/cms", "T3_TW_TIDC": "root://tidc-smstor1.grid.sinica.edu.tw:1094//eos/cms", "T2_LB_HPC4L": "root://mgm.hpc4l.org:1094//eos/cms"}
+{"T0_CH_CERN_Disk": {"/+store/t0streamer/(.*)": "root://eoscms.cern.ch//eos/cms/store/t0streamer/$1?eos.app=cmst0", "/+store/(.*)": "root://eoscms.cern.ch//eos/cms/tier0/store/$1?eos.app=cmst0"}, "T0_CH_CERN_Pilot": {"/+store/t0streamer/(.*)": "root://eospilot.cern.ch//eos/pilot/cms/tier0/store/t0streamer/$1?eos.app=cmst0", "/+store/(.*)": "root://eospilot.cern.ch//eos/pilot/cms/tier0/store/$1?eos.app=cmst0"}, "T1_DE_KIT_Disk": "root://cmsdcache-kit-disk.gridka.de:1094/", "T1_ES_PIC_Disk": "root://xrootd-cmst1-door.pic.es:1094//pnfs/pic.es/data/cms/disk", "T1_FR_CCIN2P3_Disk": "root://ccxrdcms.in2p3.fr:1094/", "T1_IT_CNAF_Disk": "root://xrootd-cms.infn.it:1194/", "T1_RU_JINR_Disk": "root://xrootd01.jinr-t1.ru:1094//pnfs/jinr-t1.ru/data/cms", "T1_UK_RAL_Disk": "root://rdr.echo.stfc.ac.uk/", "T1_US_FNAL_Disk": {"/+store/temp/user/(.*)": "root://cmseos.fnal.gov//eos/uscms/store/temp/user/$1", "/+store/(.*)": "root://cmsdcadisk.fnal.gov//dcache/uscmsdisk/store/$1"}, "T2_AT_Vienna": "root://eos.grid.vbc.ac.at:1094//eos/vbc/experiments/cms", "T2_BE_IIHE": {"/+(.*)": "root://maite.iihe.ac.be:1094//$1"}, "T2_BR_SPRACE": {"/+(.*)": "root://osg-se.sprace.org.br:1094//$1"}, "T2_BR_UERJ": "root://xrootd2.hepgrid.uerj.br:1094/", "T2_CH_CERN": "root://eoscms.cern.ch//eos/cms", "T2_CH_CSCS": "root://storage01.lcg.cscs.ch:1096//pnfs/lcg.cscs.ch/cms/trivcat", "T2_CN_Beijing": "root://cceos.ihep.ac.cn:1094//eos/ihep/cms", "T2_DE_DESY": {"/+(.*)": "root://dcache-cms-xrootd.desy.de:1094//$1"}, "T2_EE_Estonia": "root://xrootd.hep.kbfi.ee:1094/", "T2_ES_CIEMAT": "root://gaexrdoor.ciemat.es:1094/", "T2_ES_IFCA": "root://gridftp.ifca.es/", "T2_FI_HIP": "root://hip-cms-se.csc.fi:1094/", "T2_FR_IPHC": "root://sbgdcache.in2p3.fr/", "T2_HU_Budapest": "root://grid143.kfki.hu:1094/", "T2_IN_TIFR": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T2_IT_Legnaro": "root://t2-xrdcms.lnl.infn.it:7070/", "T2_KR_KISTI": "root://cms-t2-se01.sdfarm.kr:1094/", "T2_PK_NCP": "root://pcncp22.ncp.edu.pk:1094//dpm/ncp.edu.pk/home/cms", "T2_PL_Swierk": "root://se.cis.gov.pl:1094//grid/cms", "T2_PT_NCG_Lisbon": "root://xroot01.ncg.ingrid.pt:1094/", "T2_RU_IHEP": "root://dp0015.m45.ihep.su:1094/", "T2_RU_INR": "root://grse001.inr.troitsk.ru:1094/", "T2_RU_ITEP": "root://se3.itep.ru/", "T2_RU_JINR": "root://lcgsedr01.jinr.ru:1094//pnfs/jinr.ru/data/cms", "T2_TR_METU": "root://eymir.grid.metu.edu.tr//dpm/grid.metu.edu.tr/home/cms", "T2_TW_NCHC": "root://se01.grid.nchc.org.tw//cms", "T2_UA_KIPT": "root://cms-se0.kipt.kharkov.ua//dpm/kipt.kharkov.ua/home/cms", "T2_UK_London_Brunel": "root://xrootdgw.brunel.ac.uk:1094/", "T2_UK_London_IC": "root://gfe02.grid.hep.ph.ic.ac.uk:1094//pnfs/hep.ph.ic.ac.uk/data/cms", "T2_UK_SGrid_Bristol": "root://xrootd.phy.bris.ac.uk:1094//xrootd/cms", "T2_UK_SGrid_RALPP": "root://mover.pp.rl.ac.uk:1094/pnfs/pp.rl.ac.uk/data/cms", "T2_US_Caltech": "root://k8s-redir.ultralight.org:1094/", "T2_US_Florida": "root://cmsio2.rc.ufl.edu:1094/", "T2_US_MIT": {"/+store/(.*)": "root://t2dsk0011.cmsaf.mit.edu:1094//store/$1"}, "T2_US_Nebraska": "root://xrootd-local.unl.edu:1094/", "T2_US_Purdue": "root://eos.cms.rcac.purdue.edu/", "T2_US_UCSD": "root://redirector.t2.ucsd.edu:1095/", "T2_US_Vanderbilt": "root://xrootd-vanderbilt.sites.opensciencegrid.org:1094/", "T2_US_Wisconsin": "root://cmsxrootd.hep.wisc.edu:1094/", "T3_BG_UNI_SOFIA": "root://se01.grid.uni-sofia.bg:1094//dpm/grid.uni-sofia.bg/home/cms", "T3_BY_NCPHEP": "root://grid05.hep.by//cms", "T3_CH_CERN_OpenData": {"/+store/data/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1", "/+store/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/$1"}, "T3_CH_CERN_OpenData_Stage": {"/+store/data/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/upload/$1", "/+store/(.*)": "root://eospublic.cern.ch//eos/opendata/cms/upload/$1"}, "T3_CH_PSI": "root://t3se01.psi.ch:1094/", "T3_FR_IPNL": "root://lyoeos.in2p3.fr:1094//eos/lyoeos.in2p3.fr/grid/cms", "T3_HU_Debrecen": "root://dpm.grid.atomki.hu/", "T3_IN_TIFRCloud": "root://se01.indiacms.res.in//dpm/indiacms.res.in/home/cms", "T3_IN_VBU": "root://storage.vb-ehep.in//dpm/vb-ehep.in/home/cms", "T3_IR_IPM": "root://se1.hep.ipm.ir/data", "T3_IT_Perugia": "root://cream-bdii.pg.infn.it//storage/cms", "T3_IT_Trieste": "root://cmsxrd.ts.infn.it:1094/", "T3_KR_KISTI": "root://cms-xrdr.sdfarm.kr:1094//xrd", "T3_KR_KNU": "root://cluster142.knu.ac.kr:1094/", "T3_KR_UOS": "root://cms.sscc.uos.ac.kr:1094/", "T3_MX_Cinvestav": "root://proton.fis.cinvestav.mx/", "T3_RU_MEPhI": "root://cms.lxfarm.mephi.ru//lustre/cms/phedex", "T3_US_Baylor": "root://kodiak-se.baylor.edu:1094/", "T3_US_Brown": "root://bruxmg.hep.brown.edu:1094/", "T3_US_Colorado": "root://hepxrd01-colorado.sites.opensciencegrid.org:1094/", "T3_US_FNALLPC": "root://cmseos.fnal.gov//eos/uscms", "T3_US_MIT": "root://submit55.mit.edu:1094/", "T3_US_NotreDame": "root://skynet013.crc.nd.edu/", "T3_US_OSG_SoCal_Cache": "root://xcache.ultralight.org:3040/", "T3_US_PuertoRico": "root://cms-se.hep.uprm.edu/", "T3_US_Rice": "root://bonner04.rice.edu:1094/", "T3_US_Rutgers": "root://ruhex-osgce.rutgers.edu/", "T3_US_UMD": "root://hepcms-se2.umd.edu:1094/", "T3_US_UMiss": "root://umiss005.hep.olemiss.edu:1094//cms/", "T3_US_VC3_NotreDame": "root://deepthought.crc.nd.edu/", "T3_US_CMU": "root://cmsdata.phys.cmu.edu/", "T3_IT_MIB": "root://storm.mib.infn.it:1094/", "T3_CH_CERNBOX": {"/+store/user/(.)(.*)": "root://eosuser.cern.ch//eos/user/$1/$1$2"}, "T3_CY_UCY": "root://heptaur2.ucy.ac.cy:1094/", "T2_PL_Cyfronet": "root://eos01.grid.cyfronet.pl:1094//eos/cms", "T3_TW_TIDC": "root://tidc-smstor1.grid.sinica.edu.tw:1094//eos/cms", "T2_LB_HPC4L": "root://mgm.hpc4l.org:1094//eos/cms", "T2_LV_HPCNET": "root://xrootd.tier2.hpc-net.lv:1094/", "T2_DE_RWTH": "root://grid-cms-xrootd.physik.rwth-aachen.de:1094/", "T1_PL_NCBJ_Disk": "root://se.cis.gov.pl:1094//grid/cms"}

configs/jme/cartesian_config.py

@@ -28,44 +28,104 @@
 # adding object preselection
 parameters = defaults.merge_parameters_from_files(
     default_parameters,
-    f"{localdir}/params/object_preselection.yaml",
+    f"{localdir}/params/object_preselection{'_extendedPT' if (int(os.environ.get('EXTENDED_PT_BINS', 0)) == 1) else ''}.yaml",
     f"{localdir}/params/jets_calibration.yaml",
     update=True,
 )
 
+if int(os.environ.get("UPART", 0)) == 0:
+    eta_bins = eta_bins
+else:
+    eta_bins = eta_bins_upart
+
 
 mc_truth_corr_pnetreg = None
 corr_files_pnetreg = {
+    "2016_PreVFP": f"{localdir}/params/Summer20UL16APV_V1_MC_L2Relative_AK4PFPNet.txt",
+    "2016_PostVFP": f"{localdir}/params/Summer20UL16_V1_MC_L2Relative_AK4PFPNet.txt",
+    "2017": f"{localdir}/params/Summer20UL17_V1_MC_L2Relative_AK4PFPNet.txt",
+    "2017": f"{localdir}/params/Summer20UL17_V1_MC_L2Relative_AK4PFPNet.txt",
+    "2018": f"{localdir}/params/Summer20UL18_V1_MC_L2Relative_AK4PFPNet.txt",
     "2022_preEE": f"{localdir}/params/Summer22Run3_V3_MC_L2Relative_AK4PFPNet.txt",
     "2022_postEE": f"{localdir}/params/Summer22EERun3_V3_MC_L2Relative_AK4PFPNet.txt",
     "2023_preBPix": f"{localdir}/params/Summer23Run3_V3_MC_L2Relative_AK4PFPNet.txt",
     "2023_postBPix": f"{localdir}/params/Summer23BPixRun3_V3_MC_L2Relative_AK4PFPNet.txt",
+    "2024": f"{localdir}/params/Summer24Run3_V3_MC_L2Relative_AK4PFPNet.txt",
+    "2025": f"{localdir}/params/Winter25Run3_V3_MC_L2Relative_AK4PFPNet.txt",
 }
 if int(os.environ.get("CLOSURE", 0)) == 1:
     print(f"Performing closure test with {corr_files_pnetreg[year]}")
     mc_truth_corr_pnetreg = get_closure_function_information(corr_files_pnetreg[year])
 
+mc_truth_corr_upartreg = None
+corr_files_upartreg = {
+    "2016_PreVFP": f"{localdir}/params/Summer20UL16APV_V1_MC_L2Relative_AK4PFUparT.txt",
+    "2016_PostVFP": f"{localdir}/params/Summer20UL16_V1_MC_L2Relative_AK4PFUparT.txt",
+    "2017": f"{localdir}/params/Summer20UL17_V1_MC_L2Relative_AK4PFUparT.txt",
+    "2018": f"{localdir}/params/Summer20UL18_V1_MC_L2Relative_AK4PFUparT.txt",
+    "2022_preEE": f"{localdir}/params/Summer22Run3_V3_MC_L2Relative_AK4PFUparT.txt",
+    "2022_postEE": f"{localdir}/params/Summer22EERun3_V3_MC_L2Relative_AK4PFUparT.txt",
+    "2023_preBPix": f"{localdir}/params/Summer23Run3_V3_MC_L2Relative_AK4PFUparT.txt",
+    "2023_postBPix": f"{localdir}/params/Summer23BPixRun3_V3_MC_L2Relative_AK4PFUparT.txt",
+    "2024": f"{localdir}/params/Summer24Run3_V3_MC_L2Relative_AK4PFUparT.txt",
+    "2025": f"{localdir}/params/Winter25Run3_V3_MC_L2Relative_AK4PFUparT.txt",
+}
+if int(os.environ.get("CLOSURE", 0)) == 1:
+    print(f"Performing closure test with {corr_files_upartreg[year]}")
+    mc_truth_corr_upartreg = get_closure_function_information(corr_files_upartreg[year])
+
 mc_truth_corr_pnetreg_neutrino = None
 corr_files_pnetreg_neutrino = {
+    "2016_PreVFP": f"{localdir}/params/Summer20UL16APV_V1_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
+    "2016_PostVFP": f"{localdir}/params/Summer20UL16_V1_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
+    "2017": f"{localdir}/params/Summer20UL17_V1_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
+    "2018": f"{localdir}/params/Summer20UL18_V1_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
     "2022_preEE": f"{localdir}/params/Summer22Run3_V3_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
     "2022_postEE": f"{localdir}/params/Summer22EERun3_V3_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
     "2023_preBPix": f"{localdir}/params/Summer23Run3_V3_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
     "2023_postBPix": f"{localdir}/params/Summer23BPixRun3_V3_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
+    "2024": f"{localdir}/params/Summer24Run3_V3_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
+    "2025": f"{localdir}/params/Winter25Run3_V3_MC_L2Relative_AK4PFPNetPlusNeutrino.txt",
 }
 if int(os.environ.get("CLOSURE", 0)) == 1:
     print(f"Performing closure test with {corr_files_pnetreg_neutrino[year]}")
     mc_truth_corr_pnetreg_neutrino = get_closure_function_information(
         corr_files_pnetreg_neutrino[year]
     )
 
+mc_truth_corr_upartreg_neutrino = None
+corr_files_upartreg_neutrino = {
+    "2016_PreVFP": f"{localdir}/params/Summer20UL16APV_V1_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2016_PostVFP": f"{localdir}/params/Summer20UL16_V1_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2017": f"{localdir}/params/Summer20UL17_V1_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2018": f"{localdir}/params/Summer20UL18_V1_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2022_preEE": f"{localdir}/params/Summer22Run3_V3_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2022_postEE": f"{localdir}/params/Summer22EERun3_V3_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2023_preBPix": f"{localdir}/params/Summer23Run3_V3_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2023_postBPix": f"{localdir}/params/Summer23BPixRun3_V3_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2024": f"{localdir}/params/Summer24Run3_V3_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+    "2025": f"{localdir}/params/Winter25Run3_V3_MC_L2Relative_AK4PFUparTPlusNeutrino.txt",
+}
+if int(os.environ.get("CLOSURE", 0)) == 1:
+    print(f"Performing closure test with {corr_files_upartreg_neutrino[year]}")
+    mc_truth_corr_upartreg_neutrino = get_closure_function_information(
+        corr_files_upartreg_neutrino[year]
+    )
+
 mc_truth_corr = None
 corr_files = {
+    "2016_PreVFP": f"{localdir}/params/Summer20UL16APV_V1_MC_L2Relative_AK4PFPuppi.txt",
+    "2016_PostVFP": f"{localdir}/params/Summer20UL16_V1_MC_L2Relative_AK4PFPuppi.txt",
+    "2017": f"{localdir}/params/Summer20UL17_V1_MC_L2Relative_AK4PFPuppi.txt",
+    "2018": f"{localdir}/params/Summer20UL18_V1_MC_L2Relative_AK4PFPuppi.txt",
     "2022_preEE": f"{localdir}/params/Summer22Run3_V1_MC_L2Relative_AK4PUPPI.txt",
     "2022_postEE": f"{localdir}/params/Summer22EEVetoRun3_V1_MC_L2Relative_AK4PUPPI.txt",
     "2023_preBPix": f"{localdir}/params/Summer23Run3_V1_MC_L2Relative_AK4PUPPI.txt",
     "2023_postBPix": f"{localdir}/params/Summer23BPixRun3_V3_MC_L2Relative_AK4PUPPI.txt",
+    "2024": f"{localdir}/params/Summer24Prompt24_V1_MC_L2Relative_AK4PFPuppi.txt",
+    "2025": f"{localdir}/params/Winter25Prompt25_V1_MC_L2Relative_AK4PFPuppi.txt",
 }
-print(f"Reapplying correctios {corr_files[year]}")
+print(f"Reapplying corrections {corr_files[year]}")
 mc_truth_corr = get_closure_function_information(corr_files[year])
 
 cuts_eta = []
@@ -105,18 +165,32 @@
 
 variables_dict=get_variables_dict(cuts_names_eta, cuts_names_reco_eta, cuts_names_eta_neutrino)
 
+# samples_dict = {
+    # "2022_preEE": "QCD_PT-15to7000_JMENano_Summer22",
+    # "2022_postEE": "QCD_PT-15to7000_JMENano_Summer22EE",
+    # "2023_preBPix": "QCD_PT-15to7000_JMENano_Summer23",
+    # "2023_postBPix": "QCD_PT-15to7000_JMENano_Summer23BPix",
+# }
+
 samples_dict = {
-    "2022_preEE": "QCD_PT-15to7000_JMENano_Summer22",
-    "2022_postEE": "QCD_PT-15to7000_JMENano_Summer22EE",
-    "2023_preBPix": "QCD_PT-15to7000_JMENano_Summer23",
-    "2023_postBPix": "QCD_PT-15to7000_JMENano_Summer23BPix",
+    "2016_PreVFP": "QCD_PT-15to7000_JMENano_Summer20UL16APV",
+    "2016_PostVFP": "QCD_PT-15to7000_JMENano_Summer20UL16",
+    "2017": "QCD_PT-15to7000_JMENano_Summer20UL17",
+    "2018": "QCD_PT-15to7000_JMENano_Summer20UL18",
+    "2022_preEE": "QCD_PT-15to7000_JMENanov15_Summer22",
+    "2022_postEE": "QCD_PT-15to7000_JMENanov15_Summer22EE",
+    "2023_preBPix": "QCD_PT-15to7000_JMENanov15_Summer23",
+    "2023_postBPix": "QCD_PT-15to7000_JMENanov15_Summer23BPix",
+    "2024" : "QCD_PT-15to7000_JMENano_Summer24",
+    "2025" : "QCD_PT-15to7000_JMENano_Winter25",
 }
 samples_PNetReg15_dict = {
     "2022_preEE": "QCD_PT-15to7000_PNetReg15_JMENano_Summer22",
     "2022_postEE": "QCD_PT-15to7000_PNetReg15_JMENano_Summer22EE",
     "2023_preBPix": "QCD_PT-15to7000_PNetReg15_JMENano_Summer23",
     "2023_postBPix": "QCD_PT-15to7000_PNetReg15_JMENano_Summer23BPix",
 }
+# No UparTReg15 used for now but may be added later if necessary
 
 multicuts = [
     MultiCut(
@@ -135,7 +209,7 @@
     parameters=parameters,
     datasets={
         "jsons": [
-            # f"{localdir}/datasets/QCD.json",
+            #f"{localdir}/datasets/QCD.json",
             f"{localdir}/datasets/QCD_redirector.json",
             f"{localdir}/datasets/QCD_PNetReg15.json",
         ],
@@ -160,6 +234,8 @@
         "donotscale_sumgenweights": True,
         "mc_truth_corr_pnetreg": mc_truth_corr_pnetreg,
         "mc_truth_corr_pnetreg_neutrino": mc_truth_corr_pnetreg_neutrino,
+        "mc_truth_corr_upartreg": mc_truth_corr_upartreg,
+        "mc_truth_corr_upartreg_neutrino": mc_truth_corr_upartreg_neutrino,
         "mc_truth_corr": mc_truth_corr,
         "DeltaR_matching": 0.2,
         "SetRegResponseToZero": True,
@@ -169,7 +245,13 @@
                 int(os.environ.get("PNETREG15", 0)) == 1
                 or int(os.environ.get("SPLITPNETREG15", 0)) == 1
             )
+            else
+            (0
+            if (
+                int(os.environ.get("EXTENDED_PT_BINS", 0)) == 1
+            )
             else 50
+            )
         ),
     },
     skim=[],