Changeset 1f21edf in sasmodels


Ignore:
Timestamp:
Aug 24, 2014 10:44:15 PM (10 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:
32c160a
Parents:
1780d59
Message:

restore missing 4x in cylinder.c form

Location:
sasmodels/models
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sasmodels/models/cylinder.c

    rce27e21 r1f21edf  
    202202    const real bj = (besarg == REAL(0.0) ? REAL(0.5) : J1(besarg)/besarg); 
    203203    const real si = (siarg == REAL(0.0) ? REAL(1.0) : sin(siarg)/siarg); 
    204     const real form = bj*bj*si*si; 
     204    const real form = REAL(4.0)*bj*bj*si*si; 
    205205 
    206206    // Multiply by contrast^2, normalize by cylinder volume and convert to cm-1 
  • sasmodels/models/cylinder_clone.c

    r1780d59 r1f21edf  
    203203    const real bj = (besarg == REAL(0.0) ? REAL(0.5) : J1(besarg)/besarg); 
    204204    const real si = (siarg == REAL(0.0) ? REAL(1.0) : sin(siarg)/siarg); 
    205     const real form = bj*bj*si*si; 
     205    const real form = REAL(4.0)*bj*bj*si*si; 
    206206 
    207207    // Multiply by contrast^2, normalize by cylinder volume and convert to cm-1 
     
    209209    // The additional volume factor is for polydisperse volume normalization. 
    210210    const real s = (sldCyl - sldSolv) * form_volume(radius, length); 
    211     return REAL(4.0e8) * form * s * s; // * correction; 
    212 } 
     211    return REAL(1.0e8) * form * s * s; // * correction; 
     212} 
Note: See TracChangeset for help on using the changeset viewer.