Changeset 3f89c0e in sasview for src/sas/sascalc

Timestamp:

Mar 26, 2019 3:32:31 PM (6 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

ticket-1094-headless

Children:

1d56359

Parents:

7ad12e9f

Message:

raise error if file loaded by headless fit is ambiguous

File:

• src/sas/sascalc/fit/fitstate.py (modified) (2 diffs)

src/sas/sascalc/fit/fitstate.py

@@ -144 +144 @@
         used = []
         for model in self.simfit.model_list:
+            matched = 0
             for fit in self.fits:
                 #print(model['name'], fit.data_id, model_name(fit), model['model_name'])
@@ -152 +153 @@
                     fit.constraints = constraints.setdefault(fit.fit_page, [])
                     used.append(fit)
-                    break
-            else:
+                    matched += 1
+            if matched > 1:
+                raise ValueError("more than one model matches %s"
+                                 % model['fit_page_source'])
+            elif matched == 0:
                 raise ValueError("could not find model %s in file"
                                  % model['fit_page_source'])