Changeset abb22f4 in sasmodels

Timestamp:

Sep 3, 2014 3:40:58 PM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

0496031

Parents:

1c7ffdc

Message:

support deepcopy on bumps model

Files:

• fit.py (modified) (5 diffs)
• sasmodels/bumps_model.py (modified) (5 diffs)

fit.py

@@ -20 +20 @@
 data = radial_data if section is not "tangent" else tan_data
 kernel = sas.load_model(name, dtype="single")
+cutoff = 1e-3
 
 if name == "ellipsoid":
@@ -40 +41 @@
     #model.theta_pd.range(0, 360)
     #model.background.range(0,1000)
-    model.scale.range(0, 1)
+    model.scale.range(0, 10)
 
 
@@ -71 +72 @@
         """
     pars = dict(
-        scale=.01, radius=64.1, length=66.96, sld=.291, solvent_sld=5.77, background=.1,
+        scale=.01, background=35,
+        sld=.291, solvent_sld=5.77, 
+        radius=250, length=178, 
         theta=90, phi=0,
-        radius_pd=0.1, radius_pd_n=10, radius_pd_nsigma=3,
+        radius_pd=0.1, radius_pd_n=5, radius_pd_nsigma=3,
         length_pd=0.1,length_pd_n=5, length_pd_nsigma=3,
-        theta_pd=0.1, theta_pd_n=5, theta_pd_nsigma=3,
-        phi_pd=0.1, phi_pd_n=10, phi_pd_nsigma=3)
+        theta_pd=10, theta_pd_n=50, theta_pd_nsigma=3,
+        phi_pd=0, phi_pd_n=10, phi_pd_nsigma=3)
     model = sas.BumpsModel(data, kernel, **pars)
-
-
 
     # SET THE FITTING PARAMETERS
     model.radius.range(1, 500)
     model.length.range(1, 5000)
-    #model.theta.range(-90,100)
-    #model.theta_pd.range(0, 90)
-    #model.theta_pd_n = model.theta_pd + 5
-    #model.radius_pd.range(0, 90)
-    #model.length_pd.range(0, 90)
-    model.scale.range(0, 1)
-    #model.background.range(0, 100)
-    #model.sld.range(0, 1)
+    model.theta.range(-90,100)
+    model.theta_pd.range(0, 30)
+    model.theta_pd_n = model.theta_pd + 5
+    model.radius_pd.range(0, 1)
+    model.length_pd.range(0, 2)
+    model.scale.range(0, 10)
+    model.background.range(0, 100)
 
 
@@ -161 +161 @@
     sys.exit(1)
 
+model.cutoff = cutoff
 if section is "both":
    tan_model = sas.BumpsModel(tan_data, model.model, model.parameters())
@@ -167 +168 @@
 else:
    problem = FitProblem(model)
-

sasmodels/bumps_model.py

@@ -249 +249 @@
     def __init__(self, data, model, cutoff=1e-5, **kw):
         from bumps.names import Parameter
-        partype = model.info['partype']
 
         # remember inputs so we can inspect from outside
         self.data = data
         self.model = model
+        self.cutoff = cutoff
+
+        partype = model.info['partype']
 
         # interpret data
@@ -271 +273 @@
             self._theory = np.zeros_like(data.y)
             q_vectors = [data.x]
-        #input = model.make_input(q_vectors)
-        input = model.make_input([v[self.index] for v in q_vectors])
-
-        # create model
-        self.fn = model(input)
-        self.cutoff = cutoff
+
+        # Remember function inputs so we can delay loading the function and
+        # so we can save/restore state
+        self._fn_inputs = [v[self.index] for v in q_vectors]
+        self._fn = None
 
         # define bumps parameters
         pars = []
-        extras = []
         for p in model.info['parameters']:
             name, default, limits, ptype = p[0], p[2], p[3], p[4]
@@ -315 +315 @@
     def theory(self):
         if 'theory' not in self._cache:
-            pars = [getattr(self,p).value for p in self.fn.fixed_pars]
-            pd_pars = [self._get_weights(p) for p in self.fn.pd_pars]
+            if self._fn is None:
+                input = self.model.make_input(self._fn_inputs)
+                self._fn = self.model(input)
+
+            pars = [getattr(self,p).value for p in self._fn.fixed_pars]
+            pd_pars = [self._get_weights(p) for p in self._fn.pd_pars]
             #print pars
-            self._theory[self.index] = self.fn(pars, pd_pars, self.cutoff)
-            #self._theory[:] = self.fn.eval(pars, pd_pars)
+            self._theory[self.index] = self._fn(pars, pd_pars, self.cutoff)
+            #self._theory[:] = self._fn.eval(pars, pd_pars)
             self._cache['theory'] = self._theory
         return self._cache['theory']
@@ -344 +348 @@
         from . import weights
 
-        relative = self.fn.info['partype']['pd-rel']
-        limits = self.fn.info['limits']
+        relative = self.model.info['partype']['pd-rel']
+        limits = self.model.info['limits']
         disperser,value,npts,width,nsigma = [getattr(self, par+ext)
                 for ext in ('_pd_type','','_pd_n','_pd','_pd_nsigma')]
@@ -353 +357 @@
         return v,w/w.max()
 
+    def __getstate__(self):
+        # Can't pickle gpu functions, so instead make them lazy
+        state = self.__dict__.copy()
+        state['_fn'] = None
+        return state
+
+    def __setstate__(self, state):
+        self.__dict__ = state
+
 
 def demo():