Changeset 346bc88 in sasmodels for sasmodels/resolution.py

Timestamp:

Aug 31, 2015 10:24:45 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:

3e6aaad

Parents:

f224873

git-author:

Paul Kienzle <pkienzle@…> (08/31/15 22:12:39)

git-committer:

Paul Kienzle <pkienzle@…> (08/31/15 22:24:45)

Message:

Add 2D resolution smearing. Split BumpsModel? into Experiment and Model and fix up examples.

File:

• sasmodels/resolution.py (modified) (4 diffs)

sasmodels/resolution.py

@@ -11 +11 @@
 MINIMUM_RESOLUTION = 1e-8
 
-class Resolution1D(object):
+class Resolution(object):
     """
     Abstract base class defining a 1D resolution function.
@@ -32 +32 @@
 
 
-class Perfect1D(Resolution1D):
+class Perfect1D(Resolution):
     """
     Resolution function to use when there is no actual resolution smearing
@@ -45 +45 @@
 
 
-class Pinhole1D(Resolution1D):
+class Pinhole1D(Resolution):
     r"""
     Pinhole aperture with q-dependent gaussian resolution.
@@ -74 +74 @@
 
     def apply(self, theory):
+        print "q calc", self.q_calc
+        print "weights", self.weight_matrix.shape
         return apply_resolution_matrix(self.weight_matrix, theory)
 
 
-class Slit1D(Resolution1D):
+class Slit1D(Resolution):
     """
     Slit aperture with a complicated resolution function.