Changeset 3e6aaad in sasmodels

Timestamp:

Aug 31, 2015 9:55:50 PM (9 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:

cd8dde1

Parents:

346bc88

Message:

add resolution accuracy setting to compare

Files:

• compare.py (modified) (6 diffs)
• sasmodels/bumps_model.py (modified) (2 diffs)
• sasmodels/resolution2d.py (modified) (1 diff)

compare.py

@@ -108 +108 @@
             if smearer is not None:
                 smearer.model = model  # because smear_selection has a bug
+                smearer.accuracy = data.accuracy
                 smearer.set_index(index)
                 value = smearer.get_value()
@@ -145 +146 @@
     return value, average_time
 
-def make_data(qmax, is2D, Nq=128, resolution=0.0, view='log'):
+def make_data(qmax, is2D, Nq=128, resolution=0.0, accuracy='Low', view='log'):
     if is2D:
         from sasmodels.bumps_model import empty_data2D, set_beam_stop
         data = empty_data2D(np.linspace(-qmax, qmax, Nq), resolution=resolution)
+        data.accuracy = accuracy
         set_beam_stop(data, 0.004)
         index = ~data.mask
@@ -172 +174 @@
     Nq = int(opt_values.get('-Nq', '128'))
     res = float(opt_values.get('-res', '0'))
+    accuracy = opt_values.get('-accuracy', 'Low')
     is2D = not "-1d" in opts
-    data, index = make_data(qmax, is2D, Nq, res, view=view)
+    data, index = make_data(qmax, is2D, Nq, res, accuracy, view=view)
 
 
@@ -296 +299 @@
     -mono/-poly* force monodisperse/polydisperse
     -ctypes/-sasview* whether cpu is tested using sasview or ctypes
-    -cutoff=1e-5*/value cutoff for including a point in polydispersity
+    -cutoff=1e-5* cutoff value for including a point in polydispersity
     -pars/-nopars* prints the parameter set or not
     -abs/-rel* plot relative or absolute error
@@ -302 +305 @@
     -hist/-nohist* plot histogram of relative error
     -res=0 sets the resolution width dQ/Q if calculating with resolution
+    -accuracy=Low resolution accuracy Low, Mid, High, Xhigh
 
 Key=value pairs allow you to set specific values to any of the model
@@ -326 +330 @@
 VALUE_OPTIONS = [
     # Note: random is both a name option and a value option
-    'cutoff', 'random', 'Nq', 'res',
+    'cutoff', 'random', 'Nq', 'res', 'accuracy',
     ]
 

sasmodels/bumps_model.py

@@ -399 +399 @@
             qmin = getattr(data, 'qmin', 1e-16)
             qmax = getattr(data, 'qmax', np.inf)
+            accuracy = getattr(data, 'accuracy', 'Low')
             self.index = (~data.mask) & (~np.isnan(data.data)) \
                          & (q >= qmin) & (q <= qmax)
@@ -404 +405 @@
             self.dIq = data.err_data[self.index]
             self.resolution = Pinhole2D(data=data, index=self.index,
-                                        nsigma=3.0, accuracy='Low')
+                                        nsigma=3.0, accuracy=accuracy)
             #self._theory = np.zeros_like(self.Iq)
             if not partype['orientation'] and not partype['magnetic']:

sasmodels/resolution2d.py

@@ -92 +92 @@
         nbins = nr * nphi
         # Number of bins in the dqr direction (polar coordinate of dqx and dqy)
-        bin_size = self.nsigma // nr
+        bin_size = self.nsigma / nr
         # in dq_r-direction times # of bins in dq_phi-direction
         # data length in the range of self.index