split bcdms per q2 bin

NNPDF · Aug 3, 2023 · c4c1006 · c4c1006
1 parent ac0363b
commit c4c1006
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 11 deletions.
diff --git a/extras/data/BCDMS/bcd_d/bcd_d120.data → extras/data/BCDMS/bcd_d120.data b/extras/data/BCDMS/bcd_d/bcd_d120.data → extras/data/BCDMS/bcd_d120.data
diff --git a/extras/data/BCDMS/bcd_d/bcd_d200.data → extras/data/BCDMS/bcd_d200.data b/extras/data/BCDMS/bcd_d/bcd_d200.data → extras/data/BCDMS/bcd_d200.data
diff --git a/extras/data/BCDMS/bcd_d/bcd_d280.data → extras/data/BCDMS/bcd_d280.data b/extras/data/BCDMS/bcd_d/bcd_d280.data → extras/data/BCDMS/bcd_d280.data
diff --git a/extras/data/BCDMS/bcd_p/bcd_p100.data → extras/data/BCDMS/bcd_p100.data b/extras/data/BCDMS/bcd_p/bcd_p100.data → extras/data/BCDMS/bcd_p100.data
diff --git a/extras/data/BCDMS/bcd_p/bcd_p120.data → extras/data/BCDMS/bcd_p120.data b/extras/data/BCDMS/bcd_p/bcd_p120.data → extras/data/BCDMS/bcd_p120.data
diff --git a/extras/data/BCDMS/bcd_p/bcd_p200.data → extras/data/BCDMS/bcd_p200.data b/extras/data/BCDMS/bcd_p/bcd_p200.data → extras/data/BCDMS/bcd_p200.data
diff --git a/extras/data/BCDMS/bcd_p/bcd_p280.data → extras/data/BCDMS/bcd_p280.data b/extras/data/BCDMS/bcd_p/bcd_p280.data → extras/data/BCDMS/bcd_p280.data
diff --git a/extras/data/machinery/generate/BCDMS.py b/extras/data/machinery/generate/BCDMS.py
@@ -22,15 +22,13 @@ def dump(src_path, _target):
     src = pathlib.Path(src_path)
 
     esf = []
-    for sub in sorted(src.glob("*")):
-        text = sub.read_text()
-        with tempfile.NamedTemporaryFile(mode="w") as ntf:
-            cut_text = "\n".join(text.splitlines()[::2])
-            ntf.write(cut_text)
-            ntf.flush()
-            data = load(ntf.name, 0, ["x", "y", "Q2"])
-            esf += [dict(x=d["x"], y=d["y"], Q2=d["Q2"]) for d in data]
-
+    text = src.read_text()
+    with tempfile.NamedTemporaryFile(mode="w") as ntf:
+        cut_text = "\n".join(text.splitlines()[::2])
+        ntf.write(cut_text)
+        ntf.flush()
+        data = load(ntf.name, 0, ["x", "y", "Q2"])
+        esf += [dict(x=d["x"], y=d["y"], Q2=d["Q2"]) for d in data]
     obs["prDIS"] = "NC"
     obs["observables"] = {"F2_total": esf}
     obs["ProjectileDIS"] = "electron"
@@ -46,6 +44,11 @@ def dump(src_path, _target):
 
 # renaming
 new_names = {
-    "bcd_d": "BCDMS_NC_EM_D_F2",
-    "bcd_p": "BCDMS_NC_EM_P_F2",
+    "bcd_d120": "BCDMS_NC_100GEV_EM_D_F2",
+    "bcd_d200": "BCDMS_NC_200GEV_EM_D_F2",
+    "bcd_d280": "BCDMS_NC_280GEV_EM_D_F2",
+    "bcd_p100": "BCDMS_NC_100GEV_EM_P_F2",
+    "bcd_p120": "BCDMS_NC_120GEV_EM_P_F2",
+    "bcd_p200": "BCDMS_NC_200GEV_EM_P_F2",
+    "bcd_p280": "BCDMS_NC_280GEV_EM_P_F2",
 }