Commit 596e3ac5 authored by Borreguero Calvo, Jose's avatar Borreguero Calvo, Jose
Browse files

Merge branch 'skipnan' into 'next' 

update the save_ascii_binned_1D function to include the skip_nan

Closes #895

See merge request sns-hfir-scse/sans/sans-backend!954
parents fe3c8500 0e537f0e

drtsans/save_ascii.py

+15 −5
Original line number Diff line number Diff line
@@ -23,9 +23,19 @@ def save_ascii_binned_1D(filename, title, *args, **kwargs): 
        intensity, error, mod_q, delta_mod_q - 1D numpy arrays of the same length, output from 1D binning

    """

    try:

        kwargs = args[0]._asdict()

        kwargs.update(args[0]._asdict())

    except AttributeError:

        pass

    # Read the value of skip_nan from kwargs or True as default

    skip_nan = kwargs.get('skip_nan', True)

    # Delete NaNs if requested

    if skip_nan:

        finites = np.isfinite(kwargs['intensity'])

        q = kwargs['mod_q'][finites]

        intensity = kwargs["intensity"][finites]

        error = kwargs["error"][finites]

        dq = kwargs["delta_mod_q"][finites]

    else:

        q = kwargs["mod_q"]

        intensity = kwargs["intensity"]

        error = kwargs["error"]