Changeset 36a2418 in sasmodels for sasmodels/kernel.py


Ignore:
Timestamp:
Mar 6, 2019 3:16:13 PM (8 months ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, magnetic_model, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
da3638f
Parents:
fa26e78 (diff), e5bbe64 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'beta_approx' into ticket-1015-gpu-mem-error

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernel.py

    r3199b17 r36a2418  
    135135        nout = 2 if self.info.have_Fq and self.dim == '1d' else 1 
    136136        total_weight = self.result[nout*self.q_input.nq + 0] 
     137        # Note: total_weight = sum(weight > cutoff), with cutoff >= 0, so it 
     138        # is okay to test directly against zero.  If weight is zero then I(q), 
     139        # etc. must also be zero. 
    137140        if total_weight == 0.: 
    138141            total_weight = 1. 
Note: See TracChangeset for help on using the changeset viewer.