From 9db7322dea35aa860d2e32c708b198a0f2acfa8a Mon Sep 17 00:00:00 2001 From: Ming-Yan Date: Wed, 20 Mar 2024 16:27:19 +0100 Subject: [PATCH] fix : workflow --- .github/workflows/BTA_workflow.yml | 4 ++-- .github/workflows/ctag_DY_workflow.yml | 4 ++-- .github/workflows/ctag_Wc_workflow.yml | 4 ++-- .github/workflows/ctag_ttbar_workflow.yml | 10 +++++----- .github/workflows/ttbar_workflow.yml | 4 ++-- metadata/test_bta_run3.json | 8 ++++---- runner.py | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/BTA_workflow.yml b/.github/workflows/BTA_workflow.yml index 88ed4879..b693337e 100644 --- a/.github/workflows/BTA_workflow.yml +++ b/.github/workflows/BTA_workflow.yml @@ -99,9 +99,9 @@ jobs: - name: BTA workflow test run: | - python runner.py --wf BTA --json metadata/test_bta_run3.json --campaign Summer22Run3 --executor iterative --overwrite + python runner.py --wf BTA --json metadata/test_bta_run3.json --executor iterative --overwrite - name: BTA_ttbar workflow test run: | - python runner.py --wf BTA_ttbar --json metadata/test_bta_run3.json --campaign Summer22Run3 --executor iterative --overwrite + python runner.py --wf BTA_ttbar --json metadata/test_bta_run3.json --executor iterative --overwrite diff --git a/.github/workflows/ctag_DY_workflow.yml b/.github/workflows/ctag_DY_workflow.yml index 83500f33..703ada50 100644 --- a/.github/workflows/ctag_DY_workflow.yml +++ b/.github/workflows/ctag_DY_workflow.yml @@ -110,7 +110,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ctag_DY_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 --year 2022 $opts + python runner.py --workflow ctag_DY_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts - name: ctag electron DY workflows with correctionlib @@ -126,4 +126,4 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ectag_DY_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 --year 2022 $opts + python runner.py --workflow ectag_DY_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts diff --git a/.github/workflows/ctag_Wc_workflow.yml b/.github/workflows/ctag_Wc_workflow.yml index 5dc02c84..b3b10cdb 100644 --- a/.github/workflows/ctag_Wc_workflow.yml +++ b/.github/workflows/ctag_Wc_workflow.yml @@ -113,7 +113,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ctag_Wc_sf --json metadata/test_bta_run3.json --campaign Summer22Run3 --executor iterative $opts + python runner.py --workflow ctag_Wc_sf --json metadata/test_bta_run3.json --executor iterative $opts - name: ctag electron W+c workflows with correctionlib run: | @@ -128,4 +128,4 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ectag_Wc_sf --json metadata/test_bta_run3.json --executor iterative --campaign Summer22Run3 --overwrite $opts \ No newline at end of file + python runner.py --workflow ectag_Wc_sf --json metadata/test_bta_run3.json --executor iterative --overwrite $opts \ No newline at end of file diff --git a/.github/workflows/ctag_ttbar_workflow.yml b/.github/workflows/ctag_ttbar_workflow.yml index 7a09e18e..f1a82d4c 100644 --- a/.github/workflows/ctag_ttbar_workflow.yml +++ b/.github/workflows/ctag_ttbar_workflow.yml @@ -111,7 +111,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ctag_ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow ctag_ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts - name: ctag semileptonic electron ttbar workflows with correctionlib run: | @@ -126,7 +126,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ectag_ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow ectag_ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts - name: ctag dileptonic muon ttbar workflows with correctionlib run: | @@ -141,7 +141,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ctag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow ctag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts - name: ctag dileptonic electron ttbar workflows with correctionlib run: | string=$(git log -1 --pretty=format:'%s') @@ -155,7 +155,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ectag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow ectag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts - name: ctag dileptonic emu ttbar workflows with correctionlib run: | string=$(git log -1 --pretty=format:'%s') @@ -169,5 +169,5 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow emctag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow emctag_ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts diff --git a/.github/workflows/ttbar_workflow.yml b/.github/workflows/ttbar_workflow.yml index ed923353..fadc4a01 100644 --- a/.github/workflows/ttbar_workflow.yml +++ b/.github/workflows/ttbar_workflow.yml @@ -109,7 +109,7 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow ttsemilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts - name: btag dileptonic ttbar workflows with correctionlib @@ -125,5 +125,5 @@ jobs: elif [[ $string == *"ci:weight_only"* ]]; then opts=$(echo "$opts" | sed 's/--isSyst all/--isSyst weight_only/g') fi - python runner.py --workflow ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative --campaign Summer22Run3 $opts + python runner.py --workflow ttdilep_sf --json metadata/test_bta_run3.json --limit 1 --executor iterative $opts diff --git a/metadata/test_bta_run3.json b/metadata/test_bta_run3.json index a312400f..eabd87a6 100644 --- a/metadata/test_bta_run3.json +++ b/metadata/test_bta_run3.json @@ -1,6 +1,6 @@ { -"JetMETRun2022D-22Sep2023-v1": [ - "root://eoscms.cern.ch//eos/cms/store/group/cmst3/group/deepjet//PFNano_Run3/data_2022_MINIAODv4/JetMET/Run2022D-22Sep2023-v1_BTV_Run3_2022_Comm_MINIAODv4/231125_161517/0000/data_defaultAK4_1.root"], - "QCD_PT-15to20_MuEnrichedPt5_TuneCP5_13p6TeV_pythia8": [ - "root://grid-cms-xrootd.physik.rwth-aachen.de:1094//store/user/milee/PFNano_Run3/mc_summer22_MINIAODv4/QCD_PT-15to20_MuEnrichedPt5_TuneCP5_13p6TeV_pythia8/Run3Summer22MiniAODv4-130X_mcRun3_2022_realistic_v5-v2_BTV_Run3_2022_Comm_MINIAODv4/231124_225033/0000/MC_defaultAK4_preEE_20.root"] + "JetMET0Run2023C-22Sep2023_v1-v1": [ + "root://grid-cms-xrootd.physik.rwth-aachen.de:1094//store/user/usarkar/PFNano_Run3/data_2023/JetMET0/Run2023C-22Sep2023_v1-v1_BTV_Run3_2023_Comm_MINIAODv4/231228_125731/0000/data_defaultAK4_2023_328.root"], + "QCD_PT-15to30_TuneCP5_13p6TeV_pythia8": [ + "root://grid-cms-xrootd.physik.rwth-aachen.de:1094//store/user/usarkar/PFNano_Run3/mc_summer23/QCD_PT-15to30_TuneCP5_13p6TeV_pythia8/Run3Summer23MiniAODv4-EpsilonPU_130X_mcRun3_2023_realistic_v14-v2_BTV_Run3_2023_Comm_MINIAODv4/231228_130142/0000/MC_defaultAK4_2023_1-1.root"] } diff --git a/runner.py b/runner.py index 02ea799b..9c38dea0 100644 --- a/runner.py +++ b/runner.py @@ -71,10 +71,10 @@ def get_main_parser(): help="JSON file containing dataset and file locations (default: %(default)s)", ) ## Configuations - parser.add_argument("--year", default="2022", help="Year") + parser.add_argument("--year", default="2023", help="Year") parser.add_argument( "--campaign", - default="Summer22Run3", + default="Summer23", choices=[ "Rereco17_94X", "Winter22Run3",