fix issue in Constraints.add_constraint (#255)

* fix issue in Constraints.add_constraint * rename add_constraint argument
flav-io · Jul 16, 2024 · aa153bb · aa153bb
1 parent 188120d
commit aa153bb
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 8 deletions.
diff --git a/flavio/classes.py b/flavio/classes.py
@@ -141,17 +141,20 @@ def all_parameters(self):
         """Returns a list of all parameters/observables constrained."""
         return list(self._parameters.keys())
 
-    def add_constraint(self, parameters, constraint):
+    def add_constraint(self, parameters, constraint, is_parameter_constraint=None):
         """Set the constraint on one or several parameters/observables.
 
         `constraint` must be an instance of a child of ProbabilityDistribution.
 
         Note that if there already exists a constraint, it will be removed."""
         for num, parameter in enumerate(parameters):
-            try: # check if parameter object already exists
-                p = Parameter[parameter]
-            except: # otherwise, create a new one
-                p = Parameter(parameter)
+            if is_parameter_constraint:
+                try: # check if parameter object already exists
+                    p = Parameter[parameter]
+                except: # otherwise, create a new one
+                    p = Parameter(parameter)
+                else: # if parameter exists, remove existing constraints
+                    self.remove_constraint(parameter)
             # remove constraint if there is one
             if parameter in self._parameters:
                 self.remove_constraint(parameter)

diff --git a/flavio/physics/bdecays/formfactors/b_p/bcl_parameters.py b/flavio/physics/bdecays/formfactors/b_p/bcl_parameters.py
@@ -9,4 +9,4 @@ def load_parameters(filename, constraints):
     ff_dict = yaml.safe_load(f)
     covariance = np.outer(ff_dict['uncertainties'], ff_dict['uncertainties'])*ff_dict['correlation']
     constraints.add_constraint(ff_dict['parameters'],
-            MultivariateNormalDistribution(central_value=ff_dict['central_values'], covariance=covariance) )
+            MultivariateNormalDistribution(central_value=ff_dict['central_values'], covariance=covariance), is_parameter_constraint=True)
diff --git a/flavio/physics/bdecays/formfactors/b_p/bcl_parameters_lmvd.py b/flavio/physics/bdecays/formfactors/b_p/bcl_parameters_lmvd.py
@@ -23,4 +23,4 @@ def load_parameters(filename, constraints):
                 raise ValueError('No f or b in observable name')
         observables_renamed.append(o[:index]+ ' BCL ' + o[index:])
     constraints.add_constraint(observables_renamed,
-            MultivariateNormalDistribution(central_value=central_values, covariance=covariance) )
+            MultivariateNormalDistribution(central_value=central_values, covariance=covariance), is_parameter_constraint=True)
diff --git a/flavio/physics/bdecays/formfactors/b_p/bsz_parameters.py b/flavio/physics/bdecays/formfactors/b_p/bsz_parameters.py
@@ -47,6 +47,8 @@ def load_parameters(filename, process, constraints):
             _tex_ff = tex_ff[parameter_name.split(' ')[-1].split('_')[-1]]
             p.tex = r'$' + _tex_a + r'^{' + _tex_ff + r'}$'
             p.description = r'BSZ form factor parametrization coefficient $' + _tex_a + r'$ of $' + _tex_ff + r'$'
+        else:  # if parameter exists, remove existing constraints
+            constraints.remove_constraint(parameter_name)
     [central, unc, corr] = get_ffpar(filename)
     constraints.add_constraint(parameter_names,
         MultivariateNormalDistribution(central_value=central, covariance=np.outer(unc, unc)*corr))

diff --git a/flavio/physics/bdecays/formfactors/b_v/bsz_parameters.py b/flavio/physics/bdecays/formfactors/b_v/bsz_parameters.py
@@ -48,6 +48,8 @@ def load_parameters(filename, process, constraints):
             _tex_ff = tex_ff[parameter_name.split(' ')[-1].split('_')[-1]]
             p.tex = r'$' + _tex_a + r'^{' + _tex_ff + r'}$'
             p.description = r'BSZ form factor parametrization coefficient $' + _tex_a + r'$ of $' + _tex_ff + r'$'
+        else:  # if parameter exists, remove existing constraints
+            constraints.remove_constraint(parameter_name)
     [central, unc, corr] = get_ffpar(filename)
     constraints.add_constraint(parameter_names,
         MultivariateNormalDistribution(central_value=central, covariance=np.outer(unc, unc)*corr))

diff --git a/flavio/physics/bdecays/formfactors/b_v/lattice_parameters.py b/flavio/physics/bdecays/formfactors/b_v/lattice_parameters.py
@@ -34,7 +34,7 @@ def load_parameters(file_res, file_cov, process, constraints):
           - np.diag([ cov_dict[(k,k)] for k in keys_sorted]) )
     parameter_names = [implementation_name + ' ' + coeff_name for coeff_name in keys_sorted]
     constraints.add_constraint(parameter_names,
-            MultivariateNormalDistribution(central_value=res, covariance=cov ))
+            MultivariateNormalDistribution(central_value=res, covariance=cov ), is_parameter_constraint=True)
 
 
 def lattice_load(constraints):

diff --git a/flavio/physics/bdecays/formfactors/lambdab_12/lattice_parameters.py b/flavio/physics/bdecays/formfactors/lambdab_12/lattice_parameters.py
@@ -62,6 +62,8 @@ def load_parameters(file_res, file_cov, process, constraints):
             _tex_ff = tex_ff[parameter_name.split(' ')[-1].split('_')[-1]]
             p.tex = r'$' + _tex_a + r'^{' + _tex_ff + r'}$'
             p.description = r'SSE form factor parametrization coefficient $' + _tex_a + r'$ of $' + _tex_ff + r'$'
+        else:  # if parameter exists, remove existing constraints
+            constraints.remove_constraint(parameter_name)
     constraints.add_constraint(parameter_names,
             MultivariateNormalDistribution(central_value=res, covariance=cov ))