Opened 7 years ago

Last modified 6 years ago

#845 accepted defect

Fix volume normalisation on Raspberry model

Reported by: ajj Owned by: ajj
Priority: major Milestone: SasView 4.3.0
Component: sasmodels Keywords:
Cc: Work Package: SasView Bug Fixing

Description

As noted in #815 the raspberry model needs to be doing volume calculation outside Iq function to get polydispersity working properly.

Change History (4)

comment:1 Changed 7 years ago by pkienzle

Should use the square() function for complex calculations:

     sfSS = psiS*psiS*sinc(q*(rL+deltaS*rS))*sinc(q*(rL+deltaS*rS));

becomes:

     sfSS = square(psiS*sinc(q*(rL+deltaS*rS)));

This makes life easier for the compiler since it doesn't have to figure out that the two subexpressions are identical, and saves four multiplies and a branch for each q.

Note that we now have sas_sinx_x as an available function instead of sinc.

comment:2 Changed 7 years ago by ajj

  • Owner set to ajj
  • Status changed from new to accepted

comment:3 Changed 7 years ago by ajj

This model doesn't have a single form factor volume as it actually is the sum of two form factors - the raspberry, and the free small particles.

Need to add polydispersity loop directly in this model as the auto polydispersity cannot work.

Longer term, should we implement models like this as composition models?

comment:4 Changed 6 years ago by butler

  • Milestone changed from SasView 4.2.0 to SasView 4.3.0
Note: See TracTickets for help on using tickets.