Changeset 823e620 in sasmodels for sasmodels/resolution.py
- Timestamp:
- Jan 29, 2016 10:46:54 PM (8 years ago)
- 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:
- eafc9fa
- Parents:
- 803f835
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/resolution.py
r190fc2b r823e620 14 14 "pinhole_extend_q", "slit_extend_q", "bin_edges", 15 15 "interpolate", "linear_extrapolation", "geometric_extrapolation", 16 16 ] 17 17 18 18 MINIMUM_RESOLUTION = 1e-8 … … 80 80 # default to Perfect1D if the pinhole geometry is not defined. 81 81 self.q, self.q_width = q, q_width 82 self.q_calc = pinhole_extend_q(q, q_width, nsigma=nsigma) \83 if q_calc is None else np.sort(q_calc)84 self.weight_matrix = pinhole_resolution( self.q_calc,85 82 self.q_calc = (pinhole_extend_q(q, q_width, nsigma=nsigma) 83 if q_calc is None else np.sort(q_calc)) 84 self.weight_matrix = pinhole_resolution( 85 self.q_calc, self.q, np.maximum(q_width, MINIMUM_RESOLUTION)) 86 86 87 87 def apply(self, theory):
Note: See TracChangeset
for help on using the changeset viewer.