Skip to content

Commit

Permalink
pass minmax kinematics when loading data
Browse files Browse the repository at this point in the history
  • Loading branch information
toonhasenack committed Jun 14, 2024
1 parent 2e51982 commit 71271be
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
4 changes: 2 additions & 2 deletions validphys2/src/validphys/commondataparser.py
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ def load_commondata_new(metadata):
# the uncertainties
uncertainties_df = metadata.load_uncertainties()
# and the kinematics
kin_df = metadata.load_kinematics()
kin_df = metadata.load_kinematics(drop_minmax=False)

# Once we have loaded all uncertainty files, let's check how many sys we have
nsys = len(
Expand Down Expand Up @@ -915,7 +915,7 @@ def load_commondata_new(metadata):
setname=metadata.name,
ndata=metadata.ndata,
commondataproc=procname,
nkin=3,
nkin=9,
nsys=nsys,
commondata_table=commondata_table,
systype_table=systype_table,
Expand Down
12 changes: 11 additions & 1 deletion validphys2/src/validphys/coredata.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,17 @@
from reportengine.compat import yaml
from validphys.utils import generate_path_filtered_data

KIN_NAMES = ["kin1", "kin2", "kin3"]
KIN_NAMES = [
"kin1min",
"kin1mid",
"kin1max",
"kin2min",
"kin2mid",
"kin2max",
"kin3min",
"kin3mid",
"kin3max",
]
log = logging.getLogger(__name__)


Expand Down

0 comments on commit 71271be

Please sign in to comment.