Changeset bf6b8d1 in sasview

Timestamp:

Mar 23, 2015 9:41:10 AM (10 years ago)

Author:

Doucet, Mathieu <doucetm@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c1bffa5

Parents:

1805b87

Message:

Fix P(r) estimator. Should also behave better on errors.

File:

• src/sas/pr/num_term.py (modified) (2 diffs)

src/sas/pr/num_term.py

@@ -107 +107 @@
         """
         # Generate data
-        # ls_osc = self.get0_out()
+        self.get0_out()
         med = self.median_osc()
 
@@ -144 +144 @@
             return nt, self.alpha_list[nt - 10], self.mess_list[nt - 10]
         except:
-            return self.nterm_min, self.alpha_list[10], self.mess_list[10]
+            logging.error("NTermEstimator.num_terms: %s" % sys.exc_value)
+            return self.nterm_min, self.invertor.alpha, ''