Changeset 9f4409a in sasmodels


Ignore:
Timestamp:
Mar 21, 2016 5:47:14 AM (8 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests
Children:
0a7e5eb4, 0880966
Parents:
a6f9577
Message:

working monodispersity (finally)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/kernel_iq.c

    ra6f9577 r9f4409a  
    6363      pvec[k] = pars[k+2];  // skip scale and background 
    6464    } 
    65     printf("calculating\n"); 
    66  
     65 
     66    const double volume = CALL_VOLUME(local_pars); 
    6767    #ifdef USE_OPENMP 
    6868    #pragma omp parallel for 
     
    7070    for (int i=0; i < nq; i++) { 
    7171      const double scattering = CALL_IQ(q, i, local_pars); 
    72       result[i] += pars[0]*scattering + pars[1]; 
    73     } 
    74     printf("returning\n"); 
     72      result[i] = pars[0]*scattering/volume + pars[1]; 
     73    } 
    7574    return; 
    7675  } 
Note: See TracChangeset for help on using the changeset viewer.