aligned with clib_run3

TopEFT · Dec 5, 2024 · 5f9d28f · 5f9d28f
2 parents 1ddcadd + bf428a3
commit 5f9d28f
Show file tree

Hide file tree

Showing 31 changed files with 2,727 additions and 666 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -87,7 +87,7 @@ jobs:
         run: |
           mkdir dir_for_topcoffea
           cd dir_for_topcoffea
-          git clone https://github.com/TopEFT/topcoffea.git
+          git clone https://github.com/TopEFT/topcoffea.git --branch clib_run3
           cd topcoffea
           conda run -n coffea-env pip install -e .
           cd ../..

diff --git a/analysis/topeft_run2/analysis_processor.py b/analysis/topeft_run2/analysis_processor.py
diff --git a/analysis/topeft_run2/make_cr_and_sr_plots.py b/analysis/topeft_run2/make_cr_and_sr_plots.py
diff --git a/analysis/topeft_run2/run_analysis.py b/analysis/topeft_run2/run_analysis.py
@@ -258,7 +258,7 @@ def LoadJsonToSampleName(jsonFile, prefix):
                 extra_pip_local = {"topeft": ["topeft", "setup.py"]},
             ),
             'extra_input_files': ["analysis_processor.py"],
-            'filepath': f'/scratch365/{os.environ["USER"]}',
+
             'retries': 20,
 
             # use mid-range compression for chunks results. 9 is the default for work
@@ -273,6 +273,7 @@ def LoadJsonToSampleName(jsonFile, prefix):
             # forever until a larger worker connects.
             'resource_monitor': True,
             'resources_mode': 'auto',
+            #'filepath': f'/tmp/{os.environ["USER"]}', ##Placeholder to comment out if you don't want to save wq-factory dirs in afs
 
             # this resource values may be omitted when using
             # resources_mode: 'auto', but they do make the initial portion

diff --git a/input_samples/cfgs/2022_mc_background_samples.cfg b/input_samples/cfgs/2022_mc_background_samples.cfg
@@ -31,6 +31,6 @@ file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_2022/WWW.json
 ../../input_samples/sample_jsons/background_samples/central_2022/WWZ.json
 ../../input_samples/sample_jsons/background_samples/central_2022/WZTo3LNu.json
-../../input_samples/sample_jsons/background_samples/central_2022/ZZTo4L-1Jet.json
+#../../input_samples/sample_jsons/background_samples/central_2022/ZZTo4L-1Jet.json
 ../../input_samples/sample_jsons/background_samples/central_2022/ZZTo4L.json
 ../../input_samples/sample_jsons/background_samples/central_2022/ZZZ.json
diff --git a/input_samples/cfgs/2022_mc_signal_samples.cfg b/input_samples/cfgs/2022_mc_signal_samples.cfg
@@ -9,5 +9,5 @@ file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/central_2022/2022_TTLL_MLL-50.json
 ../../input_samples/sample_jsons/signal_samples/central_2022/2022_TTLNu.json
 ../../input_samples/sample_jsons/signal_samples/central_2022/2022_TTTT.json
-../../input_samples/sample_jsons/signal_samples/central_2022/2022_TZQB-4FS_OnshellZ.json
+#../../input_samples/sample_jsons/signal_samples/central_2022/2022_TZQB-4FS_OnshellZ.json #not recommended by MC contacts
 ../../input_samples/sample_jsons/signal_samples/central_2022/2022_TZQB-Zto2L-4FS_MLL-30.json
diff --git a/input_samples/cfgs/data_samples.cfg b/input_samples/cfgs/data_samples.cfg
@@ -1,6 +1,7 @@
 # 2016 data
 # See: https://twiki.cern.ch/twiki/bin/view/CMS/PdmVDatasetsUL2016
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/data_samples/2016/DoubleEG_B-ver1_HIPM_UL2016.json
 ../../input_samples/sample_jsons/data_samples/2016/DoubleEG_B-ver2_HIPM_UL2016.json
 ../../input_samples/sample_jsons/data_samples/2016/DoubleEG_C-HIPM_UL2016.json
@@ -54,7 +55,8 @@ root://deepthought.crc.nd.edu/
 
 # 2017 data
 # See: https://twiki.cern.ch/twiki/bin/view/CMS/PdmVDatasetsUL2017
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/data_samples/2017/DoubleEG_B-UL2017.json
 ../../input_samples/sample_jsons/data_samples/2017/DoubleEG_C-UL2017.json
 ../../input_samples/sample_jsons/data_samples/2017/DoubleEG_D-UL2017.json
@@ -88,7 +90,8 @@ root://deepthought.crc.nd.edu/
 
 # 2018 data
 # See: https://twiki.cern.ch/twiki/bin/view/CMS/PdmVDatasetsUL2018
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/data_samples/2018/DoubleMuon_A-UL2018.json
 ../../input_samples/sample_jsons/data_samples/2018/DoubleMuon_B-UL2018.json
 ../../input_samples/sample_jsons/data_samples/2018/DoubleMuon_C-UL2018.json

diff --git a/input_samples/cfgs/data_samples_NDSkim.cfg b/input_samples/cfgs/data_samples_NDSkim.cfg
@@ -1,6 +1,7 @@
 # 2016 data
 # See: https://twiki.cern.ch/twiki/bin/view/CMS/PdmVDatasetsUL2016
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/data_samples/2016/DoubleEG_B-ver1_HIPM_UL2016_NDSkim.json
 ../../input_samples/sample_jsons/data_samples/2016/DoubleEG_B-ver2_HIPM_UL2016_NDSkim.json
 ../../input_samples/sample_jsons/data_samples/2016/DoubleEG_C-HIPM_UL2016_NDSkim.json
@@ -53,7 +54,8 @@ root://deepthought.crc.nd.edu/
 
 # 2017 data
 # See: https://twiki.cern.ch/twiki/bin/view/CMS/PdmVDatasetsUL2017
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/data_samples/2017/DoubleEG_B-UL2017_NDSkim.json
 ../../input_samples/sample_jsons/data_samples/2017/DoubleEG_C-UL2017_NDSkim.json
 ../../input_samples/sample_jsons/data_samples/2017/DoubleEG_D-UL2017_NDSkim.json
@@ -87,7 +89,8 @@ root://deepthought.crc.nd.edu/
 
 # 2018 data
 # See: https://twiki.cern.ch/twiki/bin/view/CMS/PdmVDatasetsUL2018
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/data_samples/2018/DoubleMuon_A-UL2018_NDSkim.json
 ../../input_samples/sample_jsons/data_samples/2018/DoubleMuon_B-UL2018_NDSkim.json
 ../../input_samples/sample_jsons/data_samples/2018/DoubleMuon_C-UL2018_NDSkim.json

diff --git a/input_samples/cfgs/mc_background_samples.cfg b/input_samples/cfgs/mc_background_samples.cfg
@@ -1,8 +1,8 @@
 # Central background samples
 
 # Central UL16APV background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_TTGamma_Dilept.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_TTGamma_SingleLept.json
 #../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_ZGToLLG.json
@@ -39,8 +39,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_GluGluToContinToZZTo4tau.json
 
 # Central UL16 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_TTGamma_Dilept.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_TTGamma_SingleLept.json
 #../../input_samples/sample_jsons/background_samples/central_UL/UL16_ZGToLLG.json
@@ -77,8 +77,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_GluGluToContinToZZTo4tau.json
 
 # Central UL17 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_TTGamma_Dilept.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_TTGamma_SingleLept.json
 #../../input_samples/sample_jsons/background_samples/central_UL/UL17_ZGToLLG.json
@@ -115,8 +115,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_GluGluToContinToZZTo4tau.json
 
 # Central UL18 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_TTGamma_Dilept.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_TTGamma_SingleLept.json
 #../../input_samples/sample_jsons/background_samples/central_UL/UL18_ZGToLLG.json

diff --git a/input_samples/cfgs/mc_background_samples_NDSkim.cfg b/input_samples/cfgs/mc_background_samples_NDSkim.cfg
@@ -1,8 +1,8 @@
 # Central background samples (relevant for both SRs and CRs)
 
 # Central UL16APV background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_TWZToLL_thad_Wlept_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_TWZToLL_tlept_Whad_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_TWZToLL_tlept_Wlept_NDSkim.json
@@ -28,8 +28,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_GluGluToContinToZZTo4tau_NDSkim.json
 
 # Central UL16 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_TWZToLL_thad_Wlept_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_TWZToLL_tlept_Whad_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_TWZToLL_tlept_Wlept_NDSkim.json
@@ -55,8 +55,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_GluGluToContinToZZTo4tau_NDSkim.json
 
 # Central UL17 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_TWZToLL_thad_Wlept_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_TWZToLL_tlept_Whad_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_TWZToLL_tlept_Wlept_NDSkim.json
@@ -82,8 +82,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_GluGluToContinToZZTo4tau_NDSkim.json
 
 # Central UL18 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_TWZToLL_thad_Wlept_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_TWZToLL_tlept_Whad_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_TWZToLL_tlept_Wlept_NDSkim.json

diff --git a/input_samples/cfgs/mc_background_samples_cr_NDSkim.cfg b/input_samples/cfgs/mc_background_samples_cr_NDSkim.cfg
@@ -1,8 +1,8 @@
 # Central background samples (just relevant for CRs)
 
 # Central UL16APV background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_ZGToLLG_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_DY10to50_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_DY50_NDSkim.json
@@ -14,8 +14,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16APV_WJetsToLNu_NDSkim.json
 
 # Central UL16 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_ZGToLLG_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_DY10to50_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_DY50_NDSkim.json
@@ -27,8 +27,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL16_WJetsToLNu_NDSkim.json
 
 # Central UL17 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_ZGToLLG_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_DY10to50_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_DY50_NDSkim.json
@@ -40,8 +40,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL17_WJetsToLNu_NDSkim.json
 
 # Central UL18 background samples
-#root://ndcms.crc.nd.edu/
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_ZGToLLG_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_DY10to50_NDSkim.json
 ../../input_samples/sample_jsons/background_samples/central_UL/UL18_DY50_NDSkim.json

diff --git a/input_samples/cfgs/mc_signal_samples.cfg b/input_samples/cfgs/mc_signal_samples.cfg
@@ -3,7 +3,8 @@
 #     - Central samples (for validating the private samples)
 
 # Private UL17 samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_tHq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_tllq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_ttHJet_b1.json
@@ -12,7 +13,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_tttt_b4.json
 
 # Private UL18 samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_tHq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_tllq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_ttHJet_b1.json
@@ -21,7 +23,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_tttt_b4.json
 
 # Private UL16 samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_tHq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_tllq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_ttHJet_b1.json
@@ -30,7 +33,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_tttt_b1.json
 
 # Private UL16APV samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16APV_tHq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16APV_tllq_b1.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16APV_ttHJet_b1.json

diff --git a/input_samples/cfgs/mc_signal_samples_NDSkim.cfg b/input_samples/cfgs/mc_signal_samples_NDSkim.cfg
@@ -3,7 +3,8 @@
 #     - Central samples (for validating the private samples)
 
 # Private UL17 samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_tHq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_tllq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_ttHJet_b1_NDSkim.json
@@ -12,7 +13,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL17_tttt_b4_NDSkim.json
 
 # Private UL18 samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_tHq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_tllq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_ttHJet_b1_NDSkim.json
@@ -21,7 +23,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL18_tttt_b4_NDSkim.json
 
 # Private UL16 samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_tHq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_tllq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_ttHJet_b1_NDSkim.json
@@ -30,7 +33,8 @@ root://deepthought.crc.nd.edu/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16_tttt_b1_NDSkim.json
 
 # Private UL16APV samples
-root://deepthought.crc.nd.edu/
+#root://hactar01.crc.nd.edu/
+file:///cms/cephfs/data/
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16APV_tHq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16APV_tllq_b1_NDSkim.json
 ../../input_samples/sample_jsons/signal_samples/private_UL/UL16APV_ttHJet_b1_NDSkim.json