Skip to content

Commit

Permalink
Update tests
Browse files Browse the repository at this point in the history
  • Loading branch information
achiefa committed Dec 9, 2024
1 parent 1ef2dc1 commit a03343f
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
6 changes: 3 additions & 3 deletions validphys2/src/validphys/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def tmp(tmpdir):
DATA = [
{'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
{'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'sys_10'},
# Explicitly put a CMS dataset between the two ATLAS
SINGLE_DATAPOINT,
]
Expand All @@ -47,7 +47,7 @@ def tmp(tmpdir):
'datasets': [
{'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
{'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'sys_10'},
],
}
]
Expand All @@ -60,7 +60,7 @@ def tmp(tmpdir):
DATA_THCOVMAT = [
{'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
{'dataset': 'CHORUS_CC_NOTFIXED_PB_NU-SIGMARED', 'variant': 'legacy_dw'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy_10'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'sys_10'},
{'dataset': 'ATLAS_WJ_8TEV_WP-PT', 'variant': 'legacy'},
{'dataset': 'LHCB_Z0_8TEV_MUON_Y', 'cfac': ['NRM']},
]
Expand Down
9 changes: 2 additions & 7 deletions validphys2/src/validphys/tests/test_plots.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def test_plot_xq2():
dataset_inputs = [
{'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy'},
{'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'variant': 'legacy'},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM']},
]

return API.plot_xq2(
Expand All @@ -107,12 +107,7 @@ def test_plot_xq2_custom():
dataset_inputs = [
{'dataset': 'NMC_NC_NOTFIXED_P_EM-SIGMARED', 'variant': 'legacy', 'custom_group': 'one'},
{'dataset': 'ATLAS_TTBAR_7TEV_TOT_X-SEC', 'variant': 'legacy', 'custom_group': 'one'},
{
'dataset': 'CMS_Z0J_8TEV_PT-Y',
'cfac': ['NRM'],
'variant': 'legacy',
'custom_group': 'two',
},
{'dataset': 'CMS_Z0J_8TEV_PT-Y', 'cfac': ['NRM'], 'custom_group': 'two'},
]

return API.plot_xq2(
Expand Down

0 comments on commit a03343f

Please sign in to comment.