feat: add sum of weights for BTA_ttbar workflow, fix typo in suball script and make basepath in BTA producers configurable

scripts/suball.py

@@ -58,8 +58,8 @@ def get_lumi_from_web(year):
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(description="Mastering workflow submission")
     parser = config_parser(parser)
-    paser = scaleout_parser(parser)
-    paser = debug_parser(parser)
+    parser = scaleout_parser(parser)
+    parser = debug_parser(parser)
     parser.add_argument(
         "-sc",
         "--scheme",
@@ -74,6 +74,16 @@ def get_lumi_from_web(year):
         required=True,
         help="Input the campaign name for DAS to search appropriate campaigns, use in dataset construction , please do `data_camapgin,mc_campaign` split by `,`, e.g. `*Run2023D*Sep2023*,*Run3Summer23BPixNanoAODv12-130X*` ",
     )
+    parser.add_argument(
+        "--whitelist_sites",
+        help="White list fot sites",
+        default=None,
+    )
+    parser.add_argument(
+        "--blacklist_sites",
+        help="Black list for sites",
+        default=None,
+    )
     parser.add_argument("-v", "--version", default="", help="version postfix")
     parser.add_argument(
         "--local",
@@ -134,14 +144,15 @@ def get_lumi_from_web(year):
             )
             or args.overwrite
         ):
+            command = f"python scripts/fetch.py -c {args.campaign} --from_workflow {wf} --DAS_campaign {args.DAS_campaign} --year {args.year} {overwrite} --skipvalidation"
+            if args.whitelist_sites is not None:
+                command += f" --whitelist_sites {args.whitelist_sites}"
+            if args.blacklist_sites is not None:
+                command += f" --blacklist_sites {args.blacklist_sites}"
             if args.debug:
-                print(
-                    f"Creating MC dataset: python scripts/fetch.py -c {args.campaign} --from_workflow {wf} --DAS_campaign {args.DAS_campaign} --year {args.year} {overwrite} --skipvalidation"
-                )
+                print(f"Creating MC dataset: {command}")
 
-            os.system(
-                f"python scripts/fetch.py -c {args.campaign} --from_workflow {wf} --DAS_campaign {args.DAS_campaign} --year {args.year} {overwrite} --skipvalidation"
-            )
+            os.system(command)
             if args.debug:
                 os.system(f"ls metadata/{args.campaign}/*.json")
 
@@ -179,6 +190,8 @@ def get_lumi_from_web(year):
                         "version",
                         "local",
                         "debug",
+                        "whitelist_sites",
+                        "blacklist_sites",
                     ]:
                         continue
                     if key in [

src/BTVNanoCommissioning/utils/correction.py

@@ -615,6 +615,7 @@ def JME_shifts(
             ## JEC variations
             if not isRealData and systematic != False:
                 if systematic != "JERC_split":
+                    ## JEC variations
                     jesuncmap = correct_map["JME"][f"{jecname}_Total_AK4PFPuppi"]
                     jesunc = ak.unflatten(jesuncmap.evaluate(j.eta, j.pt), nj)
                     unc_jets, unc_met = {}, {}
@@ -823,7 +824,7 @@ def JME_shifts(
     if "jetveto" in correct_map.keys():
         jets = update(jets, {"veto": jetveto(jets, correct_map)})
 
-        if "Summer22" in campaign:
+        if "Summer22" in str(campaign):
             jets = jets[jets.veto != 1]
     shifts.insert(0, ({"Jet": jets, "MET": met}, None))
     return shifts

src/BTVNanoCommissioning/workflows/BTA_producer.py

@@ -34,6 +34,7 @@ def __init__(
         chunksize=75000,
         addPFMuons=False,  # BTA custom argument
         addAllTracks=False,  # BTA custom argument
+        base_file_path="root://eoscms.cern.ch//eos/cms/store/group/phys_btag/milee",
     ):
         self._year = year
         self._campaign = campaign
@@ -46,6 +47,7 @@ def __init__(
         self.addPFMuons = addPFMuons
         self.addAllTracks = addAllTracks
         self.isSyst = isSyst
+        self.base_file_path = base_file_path
 
     @property
     def accumulator(self):
@@ -65,7 +67,7 @@ def process(self, events):
         if self.isSyst:
             fname = "systematic/" + fname
         checkf = os.popen(
-            f"gfal-ls root://eoscms.cern.ch//eos/cms/store/group/phys_btag/milee/{dirname}/{self._campaign.replace('Run3','')}/{fname}"
+            f"gfal-ls {self.base_file_path}/{dirname}/{self._campaign.replace('Run3','')}/{fname}"
         ).read()
         if len(checkf) > 0:
             print("skip ", checkf)
@@ -1163,7 +1165,7 @@ def process_shift(self, events, shift_name):
                     output_root[bname] = ak.zip(b_nest)
             fout["btagana/ttree"] = output_root
         os.system(
-            f"xrdcp -p --silent {fname} root://eoscms.cern.ch//eos/cms/store/group/phys_btag/milee/{dirname}/{self._campaign.replace('Run3','')}/{fname}"
+            f"xrdcp -p --silent {fname} {self.base_file_path}/{dirname}/{self._campaign.replace('Run3','')}/{fname}"
         )
         os.system(f"rm {fname}")