From ce32d072047607fbeca24a5236d34635fcddce4c Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Fri, 23 Dec 2022 09:39:16 +0000 Subject: [PATCH 1/6] fixed bug affecting, for instance, vp-comparefits introduced from commit e909c15842f01bf95444ba70cdb64b974d9e7648 --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 30bd1c02f9..788bd48038 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -322,7 +322,7 @@ def produce_fitunderlyinglaw(self, fit): """ with self.set_context(ns=self._curr_ns.new_child({"fit": fit})): _, datacuts = self.parse_from_("fit", "closuretest", write=False) - underlyinglaw = self.parse_pdf(datacuts["fakepdf"]) + underlyinglaw = self.parse_pdf(datacuts["fakepdf"].name) return {"pdf": underlyinglaw} @element_of("hyperscans") From 0b770ed159a0c44d48de8de6f2fdeae153edf665 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Tue, 27 Dec 2022 09:49:40 +0000 Subject: [PATCH 2/6] avoid parsing fakepdf again --- validphys2/src/validphys/config.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 788bd48038..ca07008f6d 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -321,8 +321,8 @@ def produce_fitunderlyinglaw(self, fit): pdf """ with self.set_context(ns=self._curr_ns.new_child({"fit": fit})): - _, datacuts = self.parse_from_("fit", "closuretest", write=False) - underlyinglaw = self.parse_pdf(datacuts["fakepdf"].name) + _, datacuts = self.parse_from_("fit", "closuretest", write=False) + underlyinglaw = datacuts["fakepdf"] return {"pdf": underlyinglaw} @element_of("hyperscans") From ab7a0975f9e3aae680ddd49577911d23173d593f Mon Sep 17 00:00:00 2001 From: Zaharid Date: Wed, 28 Dec 2022 08:59:33 +0000 Subject: [PATCH 3/6] Update validphys2/src/validphys/config.py --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index ca07008f6d..806a85afb8 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -321,7 +321,7 @@ def produce_fitunderlyinglaw(self, fit): pdf """ with self.set_context(ns=self._curr_ns.new_child({"fit": fit})): - _, datacuts = self.parse_from_("fit", "closuretest", write=False) + _, datacuts = self.parse_from_("fit", "closuretest", write=False) underlyinglaw = datacuts["fakepdf"] return {"pdf": underlyinglaw} From 54a4692f6e4fafebe8c739668bd9e34b6ed3b79c Mon Sep 17 00:00:00 2001 From: Zaharid Date: Wed, 28 Dec 2022 08:59:33 +0000 Subject: [PATCH 4/6] Update validphys2/src/validphys/config.py --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index ca07008f6d..806a85afb8 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -321,7 +321,7 @@ def produce_fitunderlyinglaw(self, fit): pdf """ with self.set_context(ns=self._curr_ns.new_child({"fit": fit})): - _, datacuts = self.parse_from_("fit", "closuretest", write=False) + _, datacuts = self.parse_from_("fit", "closuretest", write=False) underlyinglaw = datacuts["fakepdf"] return {"pdf": underlyinglaw} From 37b7107b0845ac87080fc7727d0166e2ce6fad44 Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Wed, 28 Dec 2022 16:15:27 +0000 Subject: [PATCH 5/6] Update validphys2/src/validphys/config.py, fakepdf is a validphys.core.PDF object and already parsed --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index 806a85afb8..dc7a373ba8 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -381,7 +381,7 @@ def produce_multiclosure_underlyinglaw(self, fits): "Did not find unique underlying law from fits, " f"instead found: {laws}" ) - return self.parse_pdf(laws.pop()) + return laws.pop() def produce_basisfromfit(self, fit): """Set the basis from fit config. In the fit config file the basis From bd7f6f6c207102a713724e0d6fdb162eef0d3d6b Mon Sep 17 00:00:00 2001 From: Mark Nestor Costantini Date: Sat, 31 Dec 2022 15:51:26 +0000 Subject: [PATCH 6/6] Update validphys2/src/validphys/config.py --- validphys2/src/validphys/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/validphys2/src/validphys/config.py b/validphys2/src/validphys/config.py index dc7a373ba8..806a85afb8 100644 --- a/validphys2/src/validphys/config.py +++ b/validphys2/src/validphys/config.py @@ -381,7 +381,7 @@ def produce_multiclosure_underlyinglaw(self, fits): "Did not find unique underlying law from fits, " f"instead found: {laws}" ) - return laws.pop() + return self.parse_pdf(laws.pop()) def produce_basisfromfit(self, fit): """Set the basis from fit config. In the fit config file the basis