Changeset 239c890 in sasview for src/sas/models


Ignore:
Timestamp:
Mar 9, 2015 12:43:53 PM (10 years ago)
Author:
richardh
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, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
37649847
Parents:
b1e609c
Message:

fix polydisp in lamellarPS; fix S(Q) in that and also lamellarPS_HG

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/models/c_extension/c_models/lamellarPS.cpp

    r79492222 r239c890  
    144144  for(int i=0; i< (int)weights_spacing.size(); i++) { 
    145145    dp[1] = weights_spacing[i].value; 
    146     for(int j=0; j< (int)weights_spacing.size(); j++) { 
    147       dp[2] = weights_delta[i].value; 
     146    //for(int j=0; j< (int)weights_spacing.size(); j++) {    BUGS fixed March 2015 
     147    for(int j=0; j< (int)weights_delta.size(); j++) { 
     148      //dp[2] = weights_delta[i].value;        BUG 
     149      dp[2] = weights_delta[j].value; 
    148150 
    149151      sum += weights_spacing[i].weight * weights_delta[j].weight * LamellarPS_kernel(dp, q); 
Note: See TracChangeset for help on using the changeset viewer.