Changeset 222d75c7 in sasview


Ignore:
Timestamp:
Aug 20, 2009 3:28:21 PM (15 years ago)
Author:
Jae Cho <jhjcho@…>
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:
0cfeff4
Parents:
5ff9d7f
Message:

reverted added lamellar_kernel

Location:
sansmodels/src/libigor
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • sansmodels/src/libigor/libCylinder.c

    r8e36cdd r222d75c7  
    903903        return(inten+bkg); 
    904904} 
    905 /*      LamellarFFX  :  calculates the form factor of a lamellar structure - no S(q) effects included 
    906                                                 -NO polydispersion included 
    907 */ 
    908 double lamellar_kernel(double dp[], double q){ 
    909         double scale,del,sld_bi,sld_sol,contr,bkg;              //local variables of coefficient wave 
    910         double inten, qval,Pq; 
    911         double Pi; 
    912  
    913  
    914         Pi = 4.0*atan(1.0); 
    915         scale = dp[0]; 
    916         del = dp[1]; 
    917         sld_bi = dp[2]; 
    918         sld_sol = dp[3]; 
    919         bkg = dp[4]; 
    920         qval = q; 
    921         contr = sld_bi -sld_sol; 
    922  
    923         Pq = 2.0*contr*contr/qval/qval*(1.0-cos(qval*del)); 
    924  
    925         inten = 2.0*Pi*scale*Pq/(qval*qval);            //this is now dimensionless... 
    926  
    927         inten /= del;                   //normalize by the thickness (in A) 
    928  
    929         inten *= 1.0e8;         // 1/A to 1/cm 
    930  
    931         return(inten+bkg); 
    932 } 
     905 
    933906/*      LamellarPSX  :  calculates the form factor of a lamellar structure - with S(q) effects included 
    934907------- 
  • sansmodels/src/libigor/libCylinder.h

    r975ec8e r222d75c7  
    3434double EllipCylKernel(double qq, double ra,double nu, double theta); 
    3535double TriaxialKernel(double q, double aa, double bb, double cc, double dx, double dy); 
    36 double lamellar_kernel(double dp[], double q); 
    3736double PPKernel(double aa, double mu, double uu); 
    3837double HolCylKernel(double qq, double rcore, double rshell, double length, double dum); 
Note: See TracChangeset for help on using the changeset viewer.