- Timestamp:
- Jan 22, 2019 2:14:30 PM (6 years ago)
- Branches:
- master, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249
- Children:
- 1342f6a
- Parents:
- dcd6efd
- Location:
- src/sas
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
src/sas/sascalc/corfunc/transform_thread.py
ra859f99 ref74a8b 45 45 # gamma3(R) = 1/R int_{0}^{R} gamma1(x) dx 46 46 # trapz uses the trapezium rule to calculate the integral 47 mask = xs <= 200.0 # Only calculate gamma3 up to x=200 (as this is all that's plotted)47 mask = xs <= 1000.0 # Only calculate gamma3 up to x=1000 (as this is all that's plotted) 48 48 # gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(2, len(xs[mask]) + 1)]j 49 49 # gamma3.insert(0, 1.0) # Gamma_3(0) is defined as 1 … … 79 79 80 80 transform1 = Data1D(xs, gamma1) 81 transform3 = Data1D(xs[xs <= 200], gamma3)81 transform3 = Data1D(xs[xs <= 1000], gamma3) 82 82 idf = Data1D(xs, idf) 83 83 -
src/sas/sasgui/perspectives/corfunc/corfunc_panel.py
r5652efc ref74a8b 277 277 self._transformed_data = transforms 278 278 (transform1, transform3, idf) = transforms 279 plot_x = transform1.x[transform1.x <= 200]280 plot_y = transform1.y[transform1.x <= 200]279 plot_x = transform1.x[transform1.x <= 1000] 280 plot_y = transform1.y[transform1.x <= 1000] 281 281 self._manager.show_data(Data1D(plot_x, plot_y), TRANSFORM_LABEL1) 282 # No need to shorten gamma3 as it's only calculated up to x= 200282 # No need to shorten gamma3 as it's only calculated up to x=1000 283 283 self._manager.show_data(transform3, TRANSFORM_LABEL3) 284 284 285 plot_x = idf.x[idf.x <= 200]286 plot_y = idf.y[idf.x <= 200]285 plot_x = idf.x[idf.x <= 1000] 286 plot_y = idf.y[idf.x <= 1000] 287 287 self._manager.show_data(Data1D(plot_x, plot_y), IDF_LABEL) 288 288
Note: See TracChangeset
for help on using the changeset viewer.