Ignore:
Timestamp:
May 13, 2009 9:18:52 PM (14 years ago)
Author:
ajj
Message:

Bicelle and Core-Shell Parallelepiped models for Andrea Hamill

File:
1 edited

Legend:

Unmodified
Added
Removed
  • sans/XOP_Dev/SANSAnalysis/lib/libSANSAnalysis.h

    r453 r501  
    88 */ 
    99 
     10#include "libCylinder.h" 
     11#include "libSphere.h" 
     12#include "libStructureFactor.h" 
     13#include "libTwoPhase.h" 
     14 
     15/*This should not be necessary AJJ May 09*/ 
    1016/* IGOR Fit Functions */ 
     17/* 
    1118double CylinderForm(double dp[], double q); 
    1219double EllipCyl76(double dp[], double q); 
     
    3845double CappedCylinder(double dp[], double q); 
    3946double Barbell(double dp[], double q); 
    40  
     47double PolyCoreBicelle(double dp[], double q); 
     48*/ 
    4149 
    4250/* internal functions */ 
     51/* 
    4352double CylKernel(double qq, double rr,double h, double theta); 
    4453double NR_BessJ1(double x); 
     
    6069double CSCylIntegration(double qq, double rad, double radthick, double facthick, double rhoc, double rhos, double rhosolv, double length); 
    6170double Stackdisc_kern(double qq, double rcore, double rhoc, double rhol, double rhosolv, double length, double thick, double dum, double gsd, double d, double N); 
     71double BicelleKernel(double qq, double rad, double radthick, double facthick, double rhoc, double rhoh, double rhor, double rhosolv, double length, double dum); 
     72double BicelleIntegration(double qq, double rad, double radthick, double facthick, double rhoc, double rhoh, double rhor, double rhosolv, double length); 
     73*/ 
     74 
    6275 
    6376// 
    6477/* IGOR Fit Functions */ 
     78/* 
    6579double MultiShell(double dp[], double q); 
    6680double PolyMultiShell(double dp[], double q); 
     
    112126int sqfun(int ix, int ir); 
    113127int sqcoef(int ir); 
    114  
     128*/ 
    115129//// 
    116130/* IGOR Fit Functions */ 
     131/* 
    117132double TeubnerStreyModel(double dp[], double q); 
    118133double Power_Law_Model(double dp[], double q); 
     
    134149double GaussLorentzGel(double dp[], double q); 
    135150double GaussianShell(double dp[], double q); 
    136  
     151*/ 
    137152 
    138153// since the XOP and the library are separate chunks of compiled code 
Note: See TracChangeset for help on using the changeset viewer.