Index: smodels/models/raspberry_surface_coverage.c
===================================================================
--- sasmodels/models/raspberry_surface_coverage.c	(revision 0433203b21cec5562e82731f94d8c3e23c3225be)
+++ 	(revision )
@@ -1,93 +1,0 @@
-double form_volume(double radius_lg);
-
-double Iq(double q, 
-          double sld_lg, double sld_sm, double sld_solvent,
-          double volfraction_lg, double volfraction_sm, double surf_fraction,
-          double radius_lg, double radius_sm, double penetration);
-
-double Iqxy(double qx, double qy,
-          double sld_lg, double sld_sm, double sld_solvent,
-          double volfraction_lg, double volfraction_sm, double surf_fraction,
-          double radius_lg, double radius_sm, double penetration);
-
-double form_volume(double radius_lg)
-{
-    //Because of the complex structure, volume normalization must
-    //happen in the Iq code below.  Thus the form volume is set to 1.0 here
-    double volume=1.0;
-    return volume;
-}
-
-double Iq(double q,
-          double sld_lg, double sld_sm, double sld_solvent,
-          double volfraction_lg, double volfraction_sm, double surf_fraction,
-          double radius_lg, double radius_sm, double penetration)
-{
-    // Ref: J. coll. inter. sci. (2010) vol. 343 (1) pp. 36-41.
-
-
-    double vfL, rL, sldL, vfS, rS, sldS, deltaS, delrhoL, delrhoS, sldSolv, aSs;
-    double VL, VS, Np, f2, fSs;
-    double psiL,psiS;
-    double sfLS,sfSS,Np2,fSs2;
-    double slT;
- 
-    vfL = volfraction_lg;
-    rL = radius_lg;
-    sldL = sld_lg;
-    vfS = volfraction_sm;
-    rS = radius_sm;
-    aSs = surf_fraction;
-    sldS = sld_sm;
-    deltaS = penetration;
-    sldSolv = sld_solvent;
-    
-    delrhoL = fabs(sldL - sldSolv);
-    delrhoS = fabs(sldS - sldSolv); 
-     
-    VL = M_4PI_3*rL*rL*rL;
-    VS = M_4PI_3*rS*rS*rS;
-    Np = aSs*4.0*pow(((rL+deltaS)/rS), 2.0);
-    fSs = Np*vfL*VS/vfS/VL;
-    
-    Np2 = aSs*4.0*(rS/(rL+deltaS))*VL/VS; 
-    fSs2 = Np2*vfL*VS/vfS/VL;
-    slT = delrhoL*VL + Np*delrhoS*VS;
-
-    sfLS = sph_j1c(q*rL)*sph_j1c(q*rS)*sinc(q*(rL+deltaS*rS));
-    sfSS = sph_j1c(q*rS)*sph_j1c(q*rS)*sinc(q*(rL+deltaS*rS))*sinc(q*(rL+deltaS*rS));
-        
-    f2 = delrhoL*delrhoL*VL*VL*sph_j1c(q*rL)*sph_j1c(q*rL); 
-    f2 += Np2*delrhoS*delrhoS*VS*VS*sph_j1c(q*rS)*sph_j1c(q*rS); 
-    f2 += Np2*(Np2-1)*delrhoS*delrhoS*VS*VS*sfSS; 
-    f2 += 2*Np2*delrhoL*delrhoS*VL*VS*sfLS;
-    if (f2 != 0.0){
-        f2 = f2/slT/slT;
-        }
-
-    f2 = f2*(vfL*delrhoL*delrhoL*VL + vfS*fSs2*Np2*delrhoS*delrhoS*VS);
-
-    f2+= vfS*(1.0-fSs)*pow(delrhoS, 2)*VS*sph_j1c(q*rS)*sph_j1c(q*rS);
-    
-    // normalize to single particle volume and convert to 1/cm
-    f2 *= 1.0e8;        // [=] 1/cm
-    f2 *= 1.0e-12;      // convert for (1/A^-6)^2 to (1/A)^2
-    
-    return f2;
-}
-
-
-
-double Iqxy(double qx, double qy,
-          double sld_lg, double sld_sm, double sld_solvent,
-          double volfraction_lg, double volfraction_sm, double surf_fraction,
-          double radius_lg, double radius_sm, double penetration)
-          
-{
-    double q = sqrt(qx*qx + qy*qy);
-    return Iq(q,
-          sld_lg, sld_sm, sld_solvent,
-          volfraction_lg, volfraction_sm, surf_fraction,
-          radius_lg, radius_sm, penetration);
-
-}
Index: smodels/models/raspberry_surface_coverage.py
===================================================================
--- sasmodels/models/raspberry_surface_coverage.py	(revision 0433203b21cec5562e82731f94d8c3e23c3225be)
+++ 	(revision )
@@ -1,110 +1,0 @@
-r"""
-Definition
-----------
-
-The large and small spheres have their own SLD, as well as the solvent. The
-surface coverage term is a fractional coverage (maximum of approximately 0.9
-for hexagonally-packed spheres on a surface). Since not all of the small
-spheres are necessarily attached to the surface, the excess free (small)
-spheres scattering is also included in the calculation. The function calculate
-follows equations (8)-(12) of the reference below, and the equations are not
-reproduced here.
-
-No inter-particle scattering is included in this model.
-
-
-.. figure:: img/raspberry_geometry.jpg
-
-    Schematic of the raspberry model
-    
-where *Ro* is the radius of the large sphere, *Rp* the radius of the smaller 
-spheres on the surface and |delta| = the fractional penetration depth.
-
-For 2D data: The 2D scattering intensity is calculated in the same way as 1D,
-where the *q* vector is defined as
-
-.. math::
-
-    q = \sqrt{q_x^2 + q_y^2}
-
-
-References
-----------
-
-K Larson-Smith, A Jackson, and D C Pozzo, *Small angle scattering model for Pickering emulsions and raspberry*
-*particles*, *Journal of Colloid and Interface Science*, 343(1) (2010) 36-41
-
-**Author:** Andrew jackson **on:** 2008
-
-**Modified by:** Paul Butler **on:** March 18, 2016
-
-**Reviewed by:** Paul Butler **on:** March 18, 2016
-"""
-
-from numpy import pi, inf
-
-name = "raspberry_surface_coverage"
-title = "Calculates the form factor, *P(q)*, for a 'Raspberry-like' structure \
-where there are smaller spheres at the surface of a larger sphere, such as the \
-structure of a Pickering emulsion. This version takes the suface coverage \
-of small spheres as a parameter."
-description = """
-                RaspBerryModel:
-                volfraction_lg = volume fraction large spheres
-                radius_lg = radius large sphere (A)
-                sld_lg = sld large sphere (A-2)
-                volfraction_sm = volume fraction small spheres
-                radius_sm = radius small sphere (A)
-                surface_coverage = fraction of small spheres at surface
-                sld_sm = sld small sphere
-                penetration = small sphere penetration (A)
-                sld_solvent   = sld solvent
-                background = background (cm-1)
-            Ref: J. coll. inter. sci. (2010) vol. 343 (1) pp. 36-41."""
-category = "shape:sphere"
-
-#             [ "name", "units", default, [lower, upper], "type", "description"],
-parameters = [["sld_lg", "1e-6/Ang^2", -0.4, [-inf, inf], "",
-               "large particle scattering length density"],
-              ["sld_sm", "1e-6/Ang^2", 3.5, [-inf, inf], "",
-               "small particle scattering length density"],
-              ["sld_solvent", "1e-6/Ang^2", 6.36, [-inf, inf], "",
-               "solvent scattering length density"],
-              ["volfraction_lg", "", 0.05, [-inf, inf], "",
-               "volume fraction of large spheres"],
-              ["volfraction_sm", "", 0.005, [-inf, inf], "",
-               "volume fraction of small spheres"],
-              ["surface_coverage", "", 0.4, [-inf, inf], "",
-               "surface coverage fraction of small spheres"],
-              ["radius_lg", "Ang", 5000, [0, inf], "volume",
-               "radius of large spheres"],
-              ["radius_sm", "Ang", 100, [0, inf], "",
-               "radius of small spheres"],
-              ["penetration", "Ang", 0.0, [0, inf], "",
-               "penetration depth of small spheres into large sphere"],
-             ]
-
-source = ["lib/sph_j1c.c", "raspberry_surface_coverage.c"]
-
-# parameters for demo
-demo = dict(scale=1, background=0.001,
-            sld_lg=-0.4, sld_sm=3.5, sld_solvent=6.36,
-            volfraction_lg=0.05, volfraction_sm=0.005, surf_fraction=0.4,
-            radius_lg=5000, radius_sm=100, penetration=0.0,
-            radius_lg_pd=.2, radius_lg_pd_n=10)
-
-# For testing against the old sasview models, include the converted parameter
-# names and the target sasview model name.
-oldname = 'RaspBerryModel'
-oldpars = dict(sld_lg='sld_Lsph', sld_sm='sld_Ssph', sld_solvent='sld_solv',
-               volfraction_lg='volf_Lsph', volfraction_sm='volf_Ssph',
-               surf_fraction='surfrac_Ssph',
-               radius_lg='radius_Lsph', radius_sm='radius_Ssph',
-               penetration='delta_Ssph')
-
-
-# NOTE: test results taken from values returned by SasView 3.1.2, with
-# 0.001 added for a non-zero default background.
-tests = [[{}, 0.0412755102041, 0.286669115234],
-         [{}, 0.5, 0.00103818393658],
-        ]
