Index: sansmodels/src/sans/Make.mm
===================================================================
--- sansmodels/src/sans/Make.mm	(revision 5f9648419dcb264a43db48aff3c82f4253b9de48)
+++ 	(revision )
@@ -1,49 +1,0 @@
-# -*- Makefile -*-
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-#
-#                                   Jiao Lin
-#                        California Institute of Technology
-#                           (C) 2008  All Rights Reserved
-#
-# <LicenseText>
-#
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-PROJECT = sans
-
-BUILD_DIRS = \
-	models \
-
-RECURSE_DIRS = $(BUILD_DIRS)
-
-PACKAGE = sans
-
-#--------------------------------------------------------------------------
-#
-
-all: export
-	BLD_ACTION="all" $(MM) recurse
-
-tidy::
-	BLD_ACTION="tidy" $(MM) recurse
-
-
-
-#--------------------------------------------------------------------------
-#
-# export
-
-EXPORT_PYTHON_MODULES = \
-	__init__.py \
-
-
-export:: export-python-modules 
-	BLD_ACTION="export" $(MM) recurse
-
-
-
-# version
-# $Id: Make.mm 1404 2007-08-29 15:43:42Z linjiao $
-
-# End of file
Index: sansmodels/src/sans/models/BinaryHSPSF11Model.py
===================================================================
--- sansmodels/src/sans/models/BinaryHSPSF11Model.py	(revision 96656e3ad6cdb9f8256e2118c60bac29635136af)
+++ 	(revision )
@@ -1,164 +1,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-#	This software was developed by the University of Tennessee as part of the
-#	Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#	project funded by the US National Science Foundation.
-#
-#	If you use DANSE applications to do scientific research that leads to
-#	publication, we ask that you acknowledge the use of the software with the
-#	following sentence:
-#
-#	"This work benefited from DANSE software developed under NSF award DMR-0520547."
-#
-#	copyright 2008, University of Tennessee
-##############################################################################
-
-
-""" 
-Provide functionality for a C extension model
-
-:WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-         DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\binaryHS_PSF11.h
-         AND RE-RUN THE GENERATOR SCRIPT
-
-"""
-
-from sans.models.BaseComponent import BaseComponent
-from sans_extension.c_models import CBinaryHSPSF11Model
-import copy    
-
-def create_BinaryHSPSF11Model():
-    obj = BinaryHSPSF11Model()
-    #CBinaryHSPSF11Model.__init__(obj) is called by BinaryHSPSF11Model constructor
-    return obj
-
-class BinaryHSPSF11Model(CBinaryHSPSF11Model, BaseComponent):
-    """ 
-    Class that evaluates a BinaryHSPSF11Model model. 
-    This file was auto-generated from ..\c_extensions\binaryHS_PSF11.h.
-    Refer to that file and the structure it contains
-    for details of the model.
-    List of default parameters:
-         l_radius        = 160.0 [A]
-         s_radius        = 25.0 [A]
-         vol_frac_ls     = 0.2 
-         vol_frac_ss     = 0.2 
-         ls_sld          = 3.5e-006 [1/A^(2)]
-         ss_sld          = 5e-007 [1/A^(2)]
-         solvent_sld     = 6.36e-006 [1/A^(2)]
-         background      = 0.001 [1/cm]
-
-    """
-        
-    def __init__(self):
-        """ Initialization """
-        
-        # Initialize BaseComponent first, then sphere
-        BaseComponent.__init__(self)
-        #apply(CBinaryHSPSF11Model.__init__, (self,)) 
-        CBinaryHSPSF11Model.__init__(self)
-        
-        ## Name of the model
-        self.name = "BinaryHSPSF11Model"
-        ## Model description
-        self.description ="""
-		Model parameters:
-		
-		l_radius : large radius of the binary hard sphere
-		s_radius : small radius of the binary hard sphere
-		vol_frac_ls : volume fraction of large spheres
-		vol_frac_ss : volume fraction of small spheres
-		ls_sld: large sphere  scattering length density
-		ss_sld: small sphere scattering length density
-		solvent_sld: solvent scattering length density
-		background: incoherent background"""
-       
-        ## Parameter details [units, min, max]
-        self.details = {}
-        self.details['l_radius'] = ['[A]', None, None]
-        self.details['s_radius'] = ['[A]', None, None]
-        self.details['vol_frac_ls'] = ['', None, None]
-        self.details['vol_frac_ss'] = ['', None, None]
-        self.details['ls_sld'] = ['[1/A^(2)]', None, None]
-        self.details['ss_sld'] = ['[1/A^(2)]', None, None]
-        self.details['solvent_sld'] = ['[1/A^(2)]', None, None]
-        self.details['background'] = ['[1/cm]', None, None]
-
-        ## fittable parameters
-        self.fixed=['l_radius.width', 's_radius.width']
-        
-        ## non-fittable parameters
-        self.non_fittable = []
-        
-        ## parameters with orientation
-        self.orientation_params = []
-   
-    def __reduce_ex__(self, proto):
-        """
-        Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 
-        c model.
-        """
-        return (create_BinaryHSPSF11Model,tuple())
-        
-    def clone(self):
-        """ Return a identical copy of self """
-        return self._clone(BinaryHSPSF11Model())   
-       	
-   
-    def run(self, x=0.0):
-        """ 
-        Evaluate the model
-        
-        :param x: input q, or [q,phi]
-        
-        :return: scattering function P(q)
-        
-        """
-        
-        return CBinaryHSPSF11Model.run(self, x)
-   
-    def runXY(self, x=0.0):
-        """ 
-        Evaluate the model in cartesian coordinates
-        
-        :param x: input q, or [qx, qy]
-        
-        :return: scattering function P(q)
-        
-        """
-        
-        return CBinaryHSPSF11Model.runXY(self, x)
-        
-    def evalDistribution(self, x=[]):
-        """ 
-        Evaluate the model in cartesian coordinates
-        
-        :param x: input q[], or [qx[], qy[]]
-        
-        :return: scattering function P(q[])
-        
-        """
-        return CBinaryHSPSF11Model.evalDistribution(self, x)
-        
-    def calculate_ER(self):
-        """ 
-        Calculate the effective radius for P(q)*S(q)
-        
-        :return: the value of the effective radius
-        
-        """       
-        return CBinaryHSPSF11Model.calculate_ER(self)
-        
-    def set_dispersion(self, parameter, dispersion):
-        """
-        Set the dispersion object for a model parameter
-        
-        :param parameter: name of the parameter [string]
-        :param dispersion: dispersion object of type DispersionModel
-        
-        """
-        return CBinaryHSPSF11Model.set_dispersion(self, parameter, dispersion.cdisp)
-        
-   
-# End of file
Index: sansmodels/src/sans/models/OblateModel.py
===================================================================
--- sansmodels/src/sans/models/OblateModel.py	(revision 96656e3ad6cdb9f8256e2118c60bac29635136af)
+++ 	(revision )
@@ -1,174 +1,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-#	This software was developed by the University of Tennessee as part of the
-#	Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#	project funded by the US National Science Foundation.
-#
-#	If you use DANSE applications to do scientific research that leads to
-#	publication, we ask that you acknowledge the use of the software with the
-#	following sentence:
-#
-#	"This work benefited from DANSE software developed under NSF award DMR-0520547."
-#
-#	copyright 2008, University of Tennessee
-##############################################################################
-
-
-""" 
-Provide functionality for a C extension model
-
-:WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-         DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\oblate.h
-         AND RE-RUN THE GENERATOR SCRIPT
-
-"""
-
-from sans.models.BaseComponent import BaseComponent
-from sans_extension.c_models import COblateModel
-import copy    
-
-def create_OblateModel():
-    obj = OblateModel()
-    #COblateModel.__init__(obj) is called by OblateModel constructor
-    return obj
-
-class OblateModel(COblateModel, BaseComponent):
-    """ 
-    Class that evaluates a OblateModel model. 
-    This file was auto-generated from ..\c_extensions\oblate.h.
-    Refer to that file and the structure it contains
-    for details of the model.
-    List of default parameters:
-         scale           = 1.0 
-         major_core      = 200.0 [A]
-         minor_core      = 20.0 [A]
-         major_shell     = 250.0 [A]
-         minor_shell     = 30.0 [A]
-         contrast        = 1e-006 [1/A^(2)]
-         sld_solvent     = 6.3e-006 [1/A^(2)]
-         background      = 0.001 [1/cm]
-         axis_theta      = 57.325 [deg]
-         axis_phi        = 57.325 [deg]
-
-    """
-        
-    def __init__(self):
-        """ Initialization """
-        
-        # Initialize BaseComponent first, then sphere
-        BaseComponent.__init__(self)
-        #apply(COblateModel.__init__, (self,)) 
-        COblateModel.__init__(self)
-        
-        ## Name of the model
-        self.name = "OblateModel"
-        ## Model description
-        self.description ="""[OblateCoreShellModel] Calculates the form factor for an oblate
-		ellipsoid particle with a core_shell structure.
-		The form factor is averaged over all possible
-		orientations of the ellipsoid such that P(q)
-		= scale*<f^2>/Vol + bkg, where f is the
-		single particle scattering amplitude.
-		[Parameters]:
-		major_core = radius of major_core,
-		minor_core = radius of minor_core,
-		major_shell = radius of major_shell,
-		minor_shell = radius of minor_shell,
-		contrast = SLD_core - SLD_shell
-		sld_solvent = SLD_solvent
-		background = Incoherent bkg
-		scale =scale
-		Note:It is the users' responsibility to ensure
-		that shell radii are larger than core radii."""
-       
-        ## Parameter details [units, min, max]
-        self.details = {}
-        self.details['scale'] = ['', None, None]
-        self.details['major_core'] = ['[A]', None, None]
-        self.details['minor_core'] = ['[A]', None, None]
-        self.details['major_shell'] = ['[A]', None, None]
-        self.details['minor_shell'] = ['[A]', None, None]
-        self.details['contrast'] = ['[1/A^(2)]', None, None]
-        self.details['sld_solvent'] = ['[1/A^(2)]', None, None]
-        self.details['background'] = ['[1/cm]', None, None]
-        self.details['axis_theta'] = ['[deg]', None, None]
-        self.details['axis_phi'] = ['[deg]', None, None]
-
-        ## fittable parameters
-        self.fixed=['major_core.width', 'minor_core.width', 'major_shell.width', 'minor_shell.width']
-        
-        ## non-fittable parameters
-        self.non_fittable = []
-        
-        ## parameters with orientation
-        self.orientation_params = ['axis_phi', 'axis_theta', 'axis_phi.width', 'axis_theta.width']
-   
-    def __reduce_ex__(self, proto):
-        """
-        Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 
-        c model.
-        """
-        return (create_OblateModel,tuple())
-        
-    def clone(self):
-        """ Return a identical copy of self """
-        return self._clone(OblateModel())   
-       	
-   
-    def run(self, x=0.0):
-        """ 
-        Evaluate the model
-        
-        :param x: input q, or [q,phi]
-        
-        :return: scattering function P(q)
-        
-        """
-        
-        return COblateModel.run(self, x)
-   
-    def runXY(self, x=0.0):
-        """ 
-        Evaluate the model in cartesian coordinates
-        
-        :param x: input q, or [qx, qy]
-        
-        :return: scattering function P(q)
-        
-        """
-        
-        return COblateModel.runXY(self, x)
-        
-    def evalDistribution(self, x=[]):
-        """ 
-        Evaluate the model in cartesian coordinates
-        
-        :param x: input q[], or [qx[], qy[]]
-        
-        :return: scattering function P(q[])
-        
-        """
-        return COblateModel.evalDistribution(self, x)
-        
-    def calculate_ER(self):
-        """ 
-        Calculate the effective radius for P(q)*S(q)
-        
-        :return: the value of the effective radius
-        
-        """       
-        return COblateModel.calculate_ER(self)
-        
-    def set_dispersion(self, parameter, dispersion):
-        """
-        Set the dispersion object for a model parameter
-        
-        :param parameter: name of the parameter [string]
-        :param dispersion: dispersion object of type DispersionModel
-        
-        """
-        return COblateModel.set_dispersion(self, parameter, dispersion.cdisp)
-        
-   
-# End of file
Index: sansmodels/src/sans/models/ProlateModel.py
===================================================================
--- sansmodels/src/sans/models/ProlateModel.py	(revision 96656e3ad6cdb9f8256e2118c60bac29635136af)
+++ 	(revision )
@@ -1,170 +1,0 @@
-#!/usr/bin/env python
-
-##############################################################################
-#	This software was developed by the University of Tennessee as part of the
-#	Distributed Data Analysis of Neutron Scattering Experiments (DANSE)
-#	project funded by the US National Science Foundation.
-#
-#	If you use DANSE applications to do scientific research that leads to
-#	publication, we ask that you acknowledge the use of the software with the
-#	following sentence:
-#
-#	"This work benefited from DANSE software developed under NSF award DMR-0520547."
-#
-#	copyright 2008, University of Tennessee
-##############################################################################
-
-
-""" 
-Provide functionality for a C extension model
-
-:WARNING: THIS FILE WAS GENERATED BY WRAPPERGENERATOR.PY
-         DO NOT MODIFY THIS FILE, MODIFY ..\c_extensions\prolate.h
-         AND RE-RUN THE GENERATOR SCRIPT
-
-"""
-
-from sans.models.BaseComponent import BaseComponent
-from sans_extension.c_models import CProlateModel
-import copy    
-
-def create_ProlateModel():
-    obj = ProlateModel()
-    #CProlateModel.__init__(obj) is called by ProlateModel constructor
-    return obj
-
-class ProlateModel(CProlateModel, BaseComponent):
-    """ 
-    Class that evaluates a ProlateModel model. 
-    This file was auto-generated from ..\c_extensions\prolate.h.
-    Refer to that file and the structure it contains
-    for details of the model.
-    List of default parameters:
-         scale           = 1.0 
-         major_core      = 100.0 [A]
-         minor_core      = 50.0 [A]
-         major_shell     = 110.0 [A]
-         minor_shell     = 60.0 [A]
-         contrast        = 1e-006 [1/A^(2)]
-         sld_solvent     = 6.3e-006 [1/A^(2)]
-         background      = 0.001 [1/cm]
-
-    """
-        
-    def __init__(self):
-        """ Initialization """
-        
-        # Initialize BaseComponent first, then sphere
-        BaseComponent.__init__(self)
-        #apply(CProlateModel.__init__, (self,)) 
-        CProlateModel.__init__(self)
-        
-        ## Name of the model
-        self.name = "ProlateModel"
-        ## Model description
-        self.description ="""[ProlateCoreShellModel] Calculates the form factor for a prolate
-		ellipsoid particle with a core_shell structure.
-		The form factor is averaged over all possible
-		orientations of the ellipsoid such that P(q)
-		= scale*<f^2>/Vol + bkg, where f is the
-		single particle scattering amplitude.
-		[Parameters]:
-		major_core = radius of major_core,
-		minor_core = radius of minor_core,
-		major_shell = radius of major_shell,
-		minor_shell = radius of minor_shell,
-		contrast = SLD_core - SLD_shell
-		sld_solvent = SLD_solvent
-		background = Incoherent bkg
-		scale = scale
-		Note:It is the users' responsibility to ensure
-		that shell radii are larger than core radii."""
-       
-        ## Parameter details [units, min, max]
-        self.details = {}
-        self.details['scale'] = ['', None, None]
-        self.details['major_core'] = ['[A]', None, None]
-        self.details['minor_core'] = ['[A]', None, None]
-        self.details['major_shell'] = ['[A]', None, None]
-        self.details['minor_shell'] = ['[A]', None, None]
-        self.details['contrast'] = ['[1/A^(2)]', None, None]
-        self.details['sld_solvent'] = ['[1/A^(2)]', None, None]
-        self.details['background'] = ['[1/cm]', None, None]
-
-        ## fittable parameters
-        self.fixed=['major_core.width', 'minor_core.width', 'major_shell.width', 'minor_shell.width']
-        
-        ## non-fittable parameters
-        self.non_fittable = []
-        
-        ## parameters with orientation
-        self.orientation_params = []
-   
-    def __reduce_ex__(self, proto):
-        """
-        Overwrite the __reduce_ex__ of PyTypeObject *type call in the init of 
-        c model.
-        """
-        return (create_ProlateModel,tuple())
-        
-    def clone(self):
-        """ Return a identical copy of self """
-        return self._clone(ProlateModel())   
-       	
-   
-    def run(self, x=0.0):
-        """ 
-        Evaluate the model
-        
-        :param x: input q, or [q,phi]
-        
-        :return: scattering function P(q)
-        
-        """
-        
-        return CProlateModel.run(self, x)
-   
-    def runXY(self, x=0.0):
-        """ 
-        Evaluate the model in cartesian coordinates
-        
-        :param x: input q, or [qx, qy]
-        
-        :return: scattering function P(q)
-        
-        """
-        
-        return CProlateModel.runXY(self, x)
-        
-    def evalDistribution(self, x=[]):
-        """ 
-        Evaluate the model in cartesian coordinates
-        
-        :param x: input q[], or [qx[], qy[]]
-        
-        :return: scattering function P(q[])
-        
-        """
-        return CProlateModel.evalDistribution(self, x)
-        
-    def calculate_ER(self):
-        """ 
-        Calculate the effective radius for P(q)*S(q)
-        
-        :return: the value of the effective radius
-        
-        """       
-        return CProlateModel.calculate_ER(self)
-        
-    def set_dispersion(self, parameter, dispersion):
-        """
-        Set the dispersion object for a model parameter
-        
-        :param parameter: name of the parameter [string]
-        :param dispersion: dispersion object of type DispersionModel
-        
-        """
-        return CProlateModel.set_dispersion(self, parameter, dispersion.cdisp)
-        
-   
-# End of file
