fix: Tensor conversion for expected data in _MainModel (#1044)

alexander-held · web-flow · commit 8fa2cc359093 · 2020-08-21T11:50:37.000-05:00
* Ensure the parameters of pdf._MainModel.expected_data are tensors - Amends PR #1038 * Add test for pdf._MainModel.expected_data acceptance of list instead of tensor
diff --git a/src/pyhf/pdf.py b/src/pyhf/pdf.py
@@ -514,6 +514,7 @@ def expected_data(self, pars, return_by_sample=False):
 
         """
         tensorlib, _ = get_backend()
+        pars = tensorlib.astensor(pars)
         deltas, factors = self._modifications(pars)
 
         allsum = tensorlib.concatenate(deltas + [self.nominal_rates])
diff --git a/tests/test_pdf.py b/tests/test_pdf.py
@@ -139,6 +139,9 @@ def test_pdf_basicapi_tests(backend):
     assert tensorlib.tolist(pdf.expected_auxdata(pars)) == pytest.approx(
         [51.020408630], 1e-08
     )
+    assert tensorlib.tolist(pdf.main_model.expected_data(pars)) == pytest.approx(
+        [60.0], 1e-08
+    )
 
     pdf = pyhf.simplemodels.hepdata_like(
         source['bindata']['sig'],

Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,9 @@ def test_pdf_basicapi_tests(backend):`
`139`	`139`	`assert tensorlib.tolist(pdf.expected_auxdata(pars)) == pytest.approx(`
`140`	`140`	`[51.020408630], 1e-08`
`141`	`141`	`)`
	`142`	`+ assert tensorlib.tolist(pdf.main_model.expected_data(pars)) == pytest.approx(`
	`143`	`+ [60.0], 1e-08`
	`144`	`+ )`
`142`	`145`
`143`	`146`	`pdf = pyhf.simplemodels.hepdata_like(`
`144`	`147`	`source['bindata']['sig'],`