Changes in sasmodels/data.py [d86f0fc:1a8c11c] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/data.py
rd86f0fc r1a8c11c 36 36 37 37 import numpy as np # type: ignore 38 from numpy import sqrt, sin, cos, pi 38 39 39 40 # pylint: disable=unused-import … … 301 302 302 303 303 def empty_data1D(q, resolution=0.0 ):304 def empty_data1D(q, resolution=0.0, L=0., dL=0.): 304 305 # type: (np.ndarray, float) -> Data1D 305 """306 r""" 306 307 Create empty 1D data using the given *q* as the x value. 307 308 308 *resolution* dq/q defaults to 5%. 309 rms *resolution* $\Delta q/q$ defaults to 0%. If wavelength *L* and rms 310 wavelength divergence *dL* are defined, then *resolution* defines 311 rms $\Delta \theta/\theta$ for the lowest *q*, with $\theta$ derived from 312 $q = 4\pi/\lambda \sin(\theta)$. 309 313 """ 310 314 … … 313 317 Iq, dIq = None, None 314 318 q = np.asarray(q) 315 data = Data1D(q, Iq, dx=resolution * q, dy=dIq) 319 if L != 0 and resolution != 0: 320 theta = np.arcsin(q*L/(4*pi)) 321 dtheta = theta[0]*resolution 322 ## Solving Gaussian error propagation from 323 ## Dq^2 = (dq/dL)^2 DL^2 + (dq/dtheta)^2 Dtheta^2 324 ## gives 325 ## (Dq/q)^2 = (DL/L)**2 + (Dtheta/tan(theta))**2 326 ## Take the square root and multiply by q, giving 327 ## Dq = (4*pi/L) * sqrt((sin(theta)*dL/L)**2 + (cos(theta)*dtheta)**2) 328 dq = (4*pi/L) * sqrt((sin(theta)*dL/L)**2 + (cos(theta)*dtheta)**2) 329 else: 330 dq = resolution * q 331 332 data = Data1D(q, Iq, dx=dq, dy=dIq) 316 333 data.filename = "fake data" 317 334 return data … … 486 503 # Note: masks merge, so any masked theory points will stay masked, 487 504 # and the data mask will be added to it. 488 mtheory = masked_array(theory, data.mask.copy()) 505 #mtheory = masked_array(theory, data.mask.copy()) 506 theory_x = data.x[~data.mask] 507 mtheory = masked_array(theory) 489 508 mtheory[~np.isfinite(mtheory)] = masked 490 509 if view is 'log': 491 510 mtheory[mtheory <= 0] = masked 492 plt.plot( data.x, scale*mtheory, '-')511 plt.plot(theory_x, scale*mtheory, '-') 493 512 all_positive = all_positive and (mtheory > 0).all() 494 513 some_present = some_present or (mtheory.count() > 0) … … 526 545 527 546 if use_resid: 528 mresid = masked_array(resid, data.mask.copy()) 547 theory_x = data.x[~data.mask] 548 mresid = masked_array(resid) 529 549 mresid[~np.isfinite(mresid)] = masked 530 550 some_present = (mresid.count() > 0) … … 532 552 if num_plots > 1: 533 553 plt.subplot(1, num_plots, use_calc + 2) 534 plt.plot( data.x, mresid, '.')554 plt.plot(theory_x, mresid, '.') 535 555 plt.xlabel("$q$/A$^{-1}$") 536 556 plt.ylabel('residuals')
Note: See TracChangeset
for help on using the changeset viewer.