From ef9575d79bbc73687aea79635e8640546854b241 Mon Sep 17 00:00:00 2001 From: juacrumar Date: Thu, 1 Feb 2024 14:59:40 +0100 Subject: [PATCH] merge #1869, CMS DY --- .../datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/data.yaml | 0 .../datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/filter.py | 0 .../new_commondata}/CMS_WPWM_8TEV_MUON/kinematics.yaml | 0 .../new_commondata}/CMS_WPWM_8TEV_MUON/metadata.yaml | 2 +- .../rawdata/HEPData-ins1426517-v1-Table_1.yaml | 0 .../rawdata/HEPData-ins1426517-v1-Table_2.yaml | 0 .../rawdata/HEPData-ins1426517-v1-Table_4.yaml | 0 .../rawdata/HEPData-ins1426517-v1-Table_5.yaml | 0 .../new_commondata}/CMS_WPWM_8TEV_MUON/uncertainties.yaml | 0 .../datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/data.yaml | 0 .../datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/filter.py | 0 .../new_commondata}/CMS_WP_7TEV_ELECTRON/kinematics.yaml | 0 .../new_commondata}/CMS_WP_7TEV_ELECTRON/metadata.yaml | 0 .../rawdata/HEPData-ins1118047-v1-Table_1.yaml | 0 .../rawdata/HEPData-ins1118047-v1-Table_2.yaml | 0 .../new_commondata}/CMS_WP_7TEV_ELECTRON/uncertainties.yaml | 0 .../datafiles/new_commondata}/CMS_WP_7TEV_MUON/data.yaml | 0 .../datafiles/new_commondata}/CMS_WP_7TEV_MUON/filter.py | 0 .../new_commondata}/CMS_WP_7TEV_MUON/kinematics.yaml | 0 .../datafiles/new_commondata}/CMS_WP_7TEV_MUON/metadata.yaml | 0 .../rawdata/HEPData-ins1273570-v1-Table_1.yaml | 0 .../new_commondata}/CMS_WP_7TEV_MUON/rawdata/covmat.corr | 0 .../new_commondata}/CMS_WP_7TEV_MUON/uncertainties.yaml | 0 .../datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/data.yaml | 0 .../datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/filter.py | 0 .../new_commondata}/CMS_Z0_7TEV_DIMUON/kinematics.yaml | 0 .../new_commondata}/CMS_Z0_7TEV_DIMUON/metadata.yaml | 0 .../CMS_Z0_7TEV_DIMUON/rawdata/CMS-DY2D11-ABS.data | 0 .../new_commondata}/CMS_Z0_7TEV_DIMUON/rawdata/covmat.corr | 0 .../new_commondata}/CMS_Z0_7TEV_DIMUON/uncertainties.yaml | 0 .../src/validphys/datafiles/new_commondata/dataset_names.yml | 5 ++++- 31 files changed, 5 insertions(+), 2 deletions(-) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/data.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/filter.py (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/kinematics.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/metadata.yaml (97%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_1.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_2.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_4.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_5.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WPWM_8TEV_MUON/uncertainties.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/data.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/filter.py (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/kinematics.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/metadata.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_ELECTRON/uncertainties.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/data.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/filter.py (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/kinematics.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/metadata.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/rawdata/covmat.corr (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_WP_7TEV_MUON/uncertainties.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/data.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/filter.py (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/kinematics.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/metadata.yaml (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/rawdata/CMS-DY2D11-ABS.data (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/rawdata/covmat.corr (100%) rename {buildmaster => validphys2/src/validphys/datafiles/new_commondata}/CMS_Z0_7TEV_DIMUON/uncertainties.yaml (100%) diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/data.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/data.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/data.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/data.yaml diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/filter.py b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/filter.py similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/filter.py rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/filter.py diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/kinematics.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/kinematics.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/kinematics.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/kinematics.yaml diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/metadata.yaml similarity index 97% rename from buildmaster/CMS_WPWM_8TEV_MUON/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/metadata.yaml index aaa8bc1ded..4027b5b89e 100644 --- a/buildmaster/CMS_WPWM_8TEV_MUON/metadata.yaml +++ b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/metadata.yaml @@ -1,4 +1,4 @@ -setname: "" +setname: "CMS_WPWM_8TEV_MUON" version: 1 version_comment: "First implementation" diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_1.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_1.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_1.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_1.yaml diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_2.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_2.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_2.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_2.yaml diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_4.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_4.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_4.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_4.yaml diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_5.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_5.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_5.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/rawdata/HEPData-ins1426517-v1-Table_5.yaml diff --git a/buildmaster/CMS_WPWM_8TEV_MUON/uncertainties.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/uncertainties.yaml similarity index 100% rename from buildmaster/CMS_WPWM_8TEV_MUON/uncertainties.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WPWM_8TEV_MUON/uncertainties.yaml diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/data.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/data.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/data.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/data.yaml diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/filter.py b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/filter.py similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/filter.py rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/filter.py diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/kinematics.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/kinematics.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/kinematics.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/kinematics.yaml diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/metadata.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/metadata.yaml diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_1.yaml diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/rawdata/HEPData-ins1118047-v1-Table_2.yaml diff --git a/buildmaster/CMS_WP_7TEV_ELECTRON/uncertainties.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/uncertainties.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_ELECTRON/uncertainties.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_ELECTRON/uncertainties.yaml diff --git a/buildmaster/CMS_WP_7TEV_MUON/data.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/data.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/data.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/data.yaml diff --git a/buildmaster/CMS_WP_7TEV_MUON/filter.py b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/filter.py similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/filter.py rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/filter.py diff --git a/buildmaster/CMS_WP_7TEV_MUON/kinematics.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/kinematics.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/kinematics.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/kinematics.yaml diff --git a/buildmaster/CMS_WP_7TEV_MUON/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/metadata.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/metadata.yaml diff --git a/buildmaster/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/HEPData-ins1273570-v1-Table_1.yaml diff --git a/buildmaster/CMS_WP_7TEV_MUON/rawdata/covmat.corr b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/covmat.corr similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/rawdata/covmat.corr rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/rawdata/covmat.corr diff --git a/buildmaster/CMS_WP_7TEV_MUON/uncertainties.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/uncertainties.yaml similarity index 100% rename from buildmaster/CMS_WP_7TEV_MUON/uncertainties.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_WP_7TEV_MUON/uncertainties.yaml diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/data.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/data.yaml similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/data.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/data.yaml diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/filter.py b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/filter.py similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/filter.py rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/filter.py diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/kinematics.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/kinematics.yaml similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/kinematics.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/kinematics.yaml diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/metadata.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/metadata.yaml similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/metadata.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/metadata.yaml diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/rawdata/CMS-DY2D11-ABS.data b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/rawdata/CMS-DY2D11-ABS.data similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/rawdata/CMS-DY2D11-ABS.data rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/rawdata/CMS-DY2D11-ABS.data diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/rawdata/covmat.corr b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/rawdata/covmat.corr similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/rawdata/covmat.corr rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/rawdata/covmat.corr diff --git a/buildmaster/CMS_Z0_7TEV_DIMUON/uncertainties.yaml b/validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/uncertainties.yaml similarity index 100% rename from buildmaster/CMS_Z0_7TEV_DIMUON/uncertainties.yaml rename to validphys2/src/validphys/datafiles/new_commondata/CMS_Z0_7TEV_DIMUON/uncertainties.yaml diff --git a/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml b/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml index a4584f57e1..0ff7447b60 100644 --- a/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml +++ b/validphys2/src/validphys/datafiles/new_commondata/dataset_names.yml @@ -44,4 +44,7 @@ CMS_TTB_DIFF_13TEV_2016_2L_TRAP: CMS_TTBAR_13TEV_2L_DIF_YT CMS_TTB_DIFF_13TEV_2016_2L_TRAPNORM: CMS_TTBAR_13TEV_2L_DIF_YT-NORM CMS_TTB_DIFF_13TEV_2016_2L_TTRAP: CMS_TTBAR_13TEV_2L_DIF_YTTBAR CMS_TTB_DIFF_13TEV_2016_2L_TTRAPNORM: CMS_TTBAR_13TEV_2L_DIF_YTTBAR-NORM - +CMSWEASY840PB: CMS_WP_7TEV_ELECTRON_ASY +CMSWMASY47FB: CMS_WP_7TEV_MUON_ASY +CMSDY2D11: CMS_Z0_7TEV_DIMUON_2D +CMSWMU8TEV: CMS_WPWM_8TEV_MUON_Y