Changeset f168d02 in sasview for pr_inversion/invertor.py

Timestamp:

Jul 1, 2008 2:56:32 PM (16 years ago)

Author:

Mathieu Doucet <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:

2a92852

Parents:

a17ffdf

Message:

Added slit smearing (still slow)

File:

• pr_inversion/invertor.py (modified) (5 diffs)

pr_inversion/invertor.py

@@ -73 +73 @@
     suggested_alpha = 0
     ## Last number of base functions used
-    nfunc = 0
+    nfunc = 10
     ## Last output values
     out = None
@@ -191 +191 @@
         invertor.err = self.err
         invertor.has_bck = self.has_bck
+        invertor.slit_height = self.slit_height
+        invertor.slit_width  = self.slit_width
         
         return invertor
@@ -391 +393 @@
         
         # Construct the a matrix and b vector that represent the problem
+        t_0 = time.time()
         self._get_matrix(nfunc, nq, a, b)
+        #print "elasped: ", time.time()-t_0
              
         # Perform the inversion (least square fit)
@@ -531 +535 @@
         from num_term import Num_terms
         estimator = Num_terms(self.clone())
-        
-        return estimator.num_terms(isquit_func)
+        try:
+            return estimator.num_terms(isquit_func)
+        except:
+            # If we fail, estimate alpha and return the default
+            # number of terms 
+            best_alpha, message, elapsed =self.estimate_alpha(self.nfunc)
+            return self.nfunc, best_alpha, "Could not estimate number of terms"
                     
     def estimate_alpha(self, nfunc):
@@ -572 +581 @@
             # just return the estimate
             if npeaks>1:
-                message = "Your P(r) is not smooth, please check your inversion parameters"
+                #message = "Your P(r) is not smooth, please check your inversion parameters"
+                message = None
                 return pr.suggested_alpha, message, elapsed
             else: