Ignore:
Timestamp:
Jul 17, 2017 9:53:16 AM (7 years ago)
Author:
lewis
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
7cde638
Parents:
2a54ba5
Message:

Only calculate gamma3 up to x=200, as this is all that's plotted

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sascalc/corfunc/transform_thread.py

    r2a54ba5 r22194b1  
    3535            # gamma3(R) = 1/R int_{0}^{R} gamma1(x) dx 
    3636            # trapz uses the trapezium rule to calculate the integral 
    37             gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(1, len(xs+1))] 
     37            mask = xs <= 200.0 # Only calculate gamma3 up to x=200 (as this is all that's plotted) 
     38            gamma3 = [trapz(gamma1[:n], xs[:n])/xs[n-1] for n in range(2, len(xs[mask]) + 1)] 
     39            gamma3.insert(0, 1.0) # Gamma_3(0) is defined as 1 
    3840            gamma3 = np.array(gamma3) 
    3941        except Exception as e: 
     
    5052 
    5153        transform1 = Data1D(xs, gamma1) 
    52         transform3 = Data1D(xs, gamma3) 
     54        transform3 = Data1D(xs[xs <= 200], gamma3) 
    5355 
    5456        transforms = (transform1, transform3) 
Note: See TracChangeset for help on using the changeset viewer.