Index: sansmodels/include/core_shell_bicelle.h
===================================================================
--- sansmodels/include/core_shell_bicelle.h	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
+++ sansmodels/include/core_shell_bicelle.h	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
@@ -0,0 +1,100 @@
+#if !defined(core_shell_bicelle_h)
+#define core_shell_bicelle_h
+#include "parameters.hh"
+
+/**
+ * Structure definition for core-shell bicelle parameters
+ */
+//[PYTHONCLASS] = CoreShellBicelleModel
+//[DISP_PARAMS] = radius, rim_thick, length, face_thick, axis_theta, axis_phi
+//[DESCRIPTION] = <text>P(q,alpha)= scale/Vs*f(q)^(2) + bkg,  where: f(q)= 2(core_sld
+//			- solvant_sld)* Vc*sin[qLcos(alpha/2)]
+//			/[qLcos(alpha/2)]*J1(qRsin(alpha))
+//			/[qRsin(alpha)]+2(shell_sld-solvent_sld)
+//			*Vs*sin[q(L+T)cos(alpha/2)][[q(L+T)
+//			*cos(alpha/2)]*J1(q(R+T)sin(alpha))
+//			/q(R+T)sin(alpha)]
+//
+//			alpha:is the angle between the axis of
+//          the cylinder and the q-vector
+//			Vs: the volume of the outer shell
+//			Vc: the volume of the core
+//			L: the length of the core
+//    		shell_sld: the scattering length density
+//			of the shell
+//			solvent_sld: the scattering length density
+//			of the solvent
+//			bkg: the background
+//			T: the thickness
+//    		R+T: is the outer radius
+// 		L+2T: The total length of the outershell
+//			J1: the first order Bessel function
+// 		theta: axis_theta of the cylinder
+// 		phi: the axis_phi of the cylinder...
+//		</text>
+//[FIXED]= <text> axis_phi.width; axis_theta.width; length.width;radius.width; rim_thick.width;face_thick.width</text>
+//[ORIENTATION_PARAMS]= axis_phi; axis_theta;axis_phi.width; axis_theta.width
+
+class CoreShellBicelleModel{
+public:
+  // Model parameters
+
+  /// Core radius [A]
+  //  [DEFAULT]=radius=20.0 [A]
+  Parameter radius;
+
+  /// Scale factor
+  //  [DEFAULT]=scale=1.0
+  Parameter scale;
+
+  /// Shell rim thickness [A]
+  //  [DEFAULT]=rim_thick=10.0 [A]
+  Parameter rim_thick;
+
+  /// Shell face_thick [A]
+  //  [DEFAULT]=face_thick=10.0 [A]
+  Parameter face_thick;
+
+  /// Core length [A]
+  //  [DEFAULT]=length=400.0 [A]
+  Parameter length;
+
+  /// Core SLD [1/A^(2)]
+  //  [DEFAULT]=core_sld=1.0e-6 [1/A^(2)]
+  Parameter core_sld;
+
+  /// Shell face SLD [1/A^(2)]
+  //  [DEFAULT]=face_sld=4.0e-6 [1/A^(2)]
+  Parameter face_sld;
+
+  /// Shell rim SLD [1/A^(2)]
+  //  [DEFAULT]=rim_sld=4.0e-6 [1/A^(2)]
+  Parameter rim_sld;
+
+  /// Solvent SLD [1/A^(2)]
+  //  [DEFAULT]=solvent_sld=1.0e-6 [1/A^(2)]
+  Parameter solvent_sld;
+
+  /// Incoherent Background [1/cm]
+  //  [DEFAULT]=background=0 [1/cm]
+  Parameter background;
+
+  /// Orientation of the long axis of the core-shell cylinder w/respect incoming beam [deg]
+  //  [DEFAULT]=axis_theta=90.0 [deg]
+  Parameter axis_theta;
+
+  /// Orientation of the long axis of the core-shell cylinder in the plane of the detector [deg]
+  //  [DEFAULT]=axis_phi=0.0 [deg]
+  Parameter axis_phi;
+
+  // Constructor
+  CoreShellBicelleModel();
+
+  // Operators to get I(Q)
+  double operator()(double q);
+  double operator()(double qx, double qy);
+  double calculate_ER();
+  double evaluate_rphi(double q, double phi);
+};
+
+#endif
Index: sansmodels/src/c_models/c_models.cpp
===================================================================
--- sansmodels/src/c_models/c_models.cpp	(revision 08648c055ed9beec9949b4b6563871b9101ac8a9)
+++ sansmodels/src/c_models/c_models.cpp	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
@@ -36,4 +36,5 @@
 void addCCoreFourShellModel(PyObject *module);
 void addCCoreShellCylinderModel(PyObject *module);
+void addCCoreShellBicelleModel(PyObject *module);
 void addCEllipsoidModel(PyObject *module);
 void addCEllipticalCylinderModel(PyObject *module);
@@ -254,4 +255,5 @@
   addCCSParallelepipedModel(m);
   addCCoreShellCylinderModel(m);
+  addCCoreShellBicelleModel(m);
   addCCoreShellModel(m);
   addCCoreFourShellModel(m);
Index: sansmodels/src/c_models/coreshellbicelle.cpp
===================================================================
--- sansmodels/src/c_models/coreshellbicelle.cpp	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
+++ sansmodels/src/c_models/coreshellbicelle.cpp	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
@@ -0,0 +1,429 @@
+/**
+	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
+ */
+
+/**
+ * Scattering model classes
+ * The classes use the IGOR library found in
+ *   sansmodels/src/libigor
+ *
+ */
+
+#include <math.h>
+#include "parameters.hh"
+#include <stdio.h>
+using namespace std;
+#include "core_shell_bicelle.h"
+
+extern "C" {
+#include "libCylinder.h"
+#include "libStructureFactor.h"
+}
+
+typedef struct {
+  double scale;
+  double radius;
+  double rim_thick;
+  double face_thick;
+  double length;
+  double core_sld;
+  double rim_sld;
+  double face_sld;
+  double solvent_sld;
+  double background;
+  double axis_theta;
+  double axis_phi;
+} CoreShellBicelleParameters;
+
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the core-shell Bicelle
+ * @param q: q-value
+ * @param q_x: q_x / q
+ * @param q_y: q_y / q
+ * @return: function value
+ */
+static double core_shell_bicelle_analytical_2D_scaled(CoreShellBicelleParameters *pars, double q, double q_x, double q_y) {
+  double cyl_x, cyl_y, cyl_z;
+  double q_z;
+  double alpha, vol, cos_val;
+  double answer;
+  //convert angle degree to radian
+  double pi = 4.0*atan(1.0);
+  double theta = pars->axis_theta * pi/180.0;
+  double phi = pars->axis_phi * pi/180.0;
+
+  // Cylinder orientation
+  cyl_x = sin(theta) * cos(phi);
+  cyl_y = sin(theta) * sin(phi);
+  cyl_z = cos(theta);
+
+  // q vector
+  q_z = 0;
+
+  // Compute the angle btw vector q and the
+  // axis of the cylinder
+  cos_val = cyl_x*q_x + cyl_y*q_y + cyl_z*q_z;
+
+  // The following test should always pass
+  if (fabs(cos_val)>1.0) {
+    printf("core_shell_bicelle_analytical_2D: Unexpected error: cos(alpha)=%g\n", cos_val);
+    return 0;
+  }
+
+  alpha = acos( cos_val );
+
+  // Call the IGOR library function to get the kernel
+  answer = BicelleKernel(q, pars->radius, pars->rim_thick, pars->face_thick,
+      pars->core_sld,pars->face_sld,pars->rim_sld,
+      pars->solvent_sld, pars->length/2.0, alpha) / fabs(sin(alpha));
+
+  //normalize by cylinder volume
+  vol=pi*(pars->radius+pars->rim_thick)
+          *(pars->radius+pars->rim_thick)
+          *(pars->length+2.0*pars->face_thick);
+  answer /= vol;
+
+  //convert to [cm-1]
+  answer *= 1.0e8;
+
+  //Scale
+  answer *= pars->scale;
+
+  // add in the background
+  answer += pars->background;
+
+  return answer;
+}
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the core-shell cylinder
+ * @param q: q-value
+ * @return: function value
+ */
+static double core_shell_bicelle_analytical_2DXY(CoreShellBicelleParameters *pars, double qx, double qy) {
+  double q;
+  q = sqrt(qx*qx+qy*qy);
+  return core_shell_bicelle_analytical_2D_scaled(pars, q, qx/q, qy/q);
+}
+
+
+CoreShellBicelleModel :: CoreShellBicelleModel() {
+  scale      = Parameter(1.0);
+  radius     = Parameter(20.0, true);
+  radius.set_min(0.0);
+  face_thick  = Parameter(10.0, true);
+  face_thick.set_min(0.0);
+  rim_thick  = Parameter(10.0, true);
+  rim_thick.set_min(0.0);
+  length     = Parameter(400.0, true);
+  length.set_min(0.0);
+  core_sld   = Parameter(1.e-6);
+  face_sld  = Parameter(4.e-6);
+  rim_sld  = Parameter(4.e-6);
+  solvent_sld= Parameter(1.e-6);
+  background = Parameter(0.0);
+  axis_theta = Parameter(90.0, true);
+  axis_phi   = Parameter(0.0, true);
+}
+
+/**
+ * Function to evaluate 1D scattering function
+ * The NIST IGOR library is used for the actual calculation.
+ * @param q: q-value
+ * @return: function value
+ */
+double CoreShellBicelleModel :: operator()(double q) {
+  double dp[10];
+
+  dp[0] = scale();
+  dp[1] = radius();
+  dp[2] = rim_thick();
+  dp[3] = face_thick();
+  dp[4] = length();
+  dp[5] = core_sld();
+  dp[6] = face_sld();
+  dp[7] = rim_sld();
+  dp[8] = solvent_sld();
+  dp[9] = 0.0;
+  double pi = 4.0*atan(1.0);
+  // Get the dispersion points for the radius
+  vector<WeightPoint> weights_rad;
+  radius.get_weights(weights_rad);
+
+  // Get the dispersion points for the thickness
+  vector<WeightPoint> weights_rthick;
+  rim_thick.get_weights(weights_rthick);
+
+  // Get the dispersion points for the thickness
+  vector<WeightPoint> weights_fthick;
+  face_thick.get_weights(weights_fthick);
+
+  // Get the dispersion points for the length
+  vector<WeightPoint> weights_len;
+  length.get_weights(weights_len);
+
+  // Perform the computation, with all weight points
+  double sum = 0.0;
+  double norm = 0.0;
+  double vol = 0.0;
+
+  // Loop over radius weight points
+  for(size_t i=0; i<weights_rad.size(); i++) {
+    dp[1] = weights_rad[i].value;
+
+    // Loop over length weight points
+    for(size_t j=0; j<weights_len.size(); j++) {
+      dp[4] = weights_len[j].value;
+
+      // Loop over thickness weight points
+      for(size_t k=0; k<weights_rthick.size(); k++) {
+        dp[2] = weights_rthick[k].value;
+        for(size_t l=0; l<weights_fthick.size(); l++) {
+            dp[3] = weights_fthick[l].value;
+			//Un-normalize by volume
+			sum += weights_rad[i].weight
+				* weights_len[j].weight
+				* weights_rthick[k].weight
+				* weights_fthick[l].weight
+				* BicelleIntegration(q, dp[1],dp[2], dp[3],
+						dp[5],dp[6],dp[7],dp[8], dp[4]);
+			//* pow(weights_rad[i].value+weights_rthick[k].value,2)
+			//*(weights_len[j].value+2.0*weights_fthick[k].value);
+			//Find average volume
+			vol += weights_rad[i].weight
+				* weights_len[j].weight
+				* weights_rthick[k].weight
+				* weights_fthick[l].weight
+				* pi * pow(weights_rad[i].value+weights_rthick[k].value,2)
+			*(weights_len[j].value+2.0*weights_fthick[l].value);
+			norm += weights_rad[i].weight
+				* weights_len[j].weight
+				* weights_rthick[k].weight
+				* weights_fthick[l].weight;
+        }
+      }
+    }
+  }
+
+  if (vol != 0.0 && norm != 0.0) {
+    //Re-normalize by avg volume
+    sum = sum/(vol/norm);}
+  //convert to [cm-1]
+  sum *= 1.0e8;
+  return sum/norm + background();
+}
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param q_x: value of Q along x
+ * @param q_y: value of Q along y
+ * @return: function value
+ */
+double CoreShellBicelleModel :: operator()(double qx, double qy) {
+  CoreShellBicelleParameters dp;
+  // Fill parameter array
+  dp.scale      = scale();
+  dp.radius     = radius();
+  dp.rim_thick  = rim_thick();
+  dp.face_thick  = face_thick();
+  dp.length     = length();
+  dp.core_sld   = core_sld();
+  dp.rim_sld  = rim_sld();
+  dp.face_sld  = face_sld();
+  dp.solvent_sld= solvent_sld();
+  dp.background = 0.0;
+  dp.axis_theta = axis_theta();
+  dp.axis_phi   = axis_phi();
+
+  // Get the dispersion points for the radius
+  vector<WeightPoint> weights_rad;
+  radius.get_weights(weights_rad);
+
+  // Get the dispersion points for the thickness
+  vector<WeightPoint> weights_rthick;
+  rim_thick.get_weights(weights_rthick);
+
+  // Get the dispersion points for the thickness
+  vector<WeightPoint> weights_fthick;
+  face_thick.get_weights(weights_fthick);
+
+  // Get the dispersion points for the length
+  vector<WeightPoint> weights_len;
+  length.get_weights(weights_len);
+
+  // Get angular averaging for theta
+  vector<WeightPoint> weights_theta;
+  axis_theta.get_weights(weights_theta);
+
+  // Get angular averaging for phi
+  vector<WeightPoint> weights_phi;
+  axis_phi.get_weights(weights_phi);
+
+  // Perform the computation, with all weight points
+  double sum = 0.0;
+  double norm = 0.0;
+  double norm_vol = 0.0;
+  double vol = 0.0;
+  double pi = 4.0*atan(1.0);
+  // Loop over radius weight points
+  for(size_t i=0; i<weights_rad.size(); i++) {
+    dp.radius = weights_rad[i].value;
+
+    // Loop over length weight points
+    for(size_t j=0; j<weights_len.size(); j++) {
+      dp.length = weights_len[j].value;
+
+      // Loop over thickness weight points
+      for(size_t m=0; m<weights_rthick.size(); m++) {
+        dp.rim_thick = weights_rthick[m].value;
+
+        // Loop over thickness weight points
+        for(size_t n=0; n<weights_fthick.size(); n++) {
+          dp.face_thick = weights_fthick[n].value;
+
+			// Average over theta distribution
+			for(size_t k=0; k<weights_theta.size(); k++) {
+			  dp.axis_theta = weights_theta[k].value;
+
+			  // Average over phi distribution
+			  for(size_t l=0; l<weights_phi.size(); l++) {
+				dp.axis_phi = weights_phi[l].value;
+				//Un-normalize by volume
+				double _ptvalue = weights_rad[i].weight
+					* weights_len[j].weight
+					* weights_rthick[m].weight
+					* weights_fthick[n].weight
+					* weights_theta[k].weight
+					* weights_phi[l].weight
+					* core_shell_bicelle_analytical_2DXY(&dp, qx, qy)
+				* pow(weights_rad[i].value+weights_rthick[m].value,2)
+				*(weights_len[j].value+2.0*weights_fthick[n].value);
+
+				if (weights_theta.size()>1) {
+				  _ptvalue *= fabs(sin(weights_theta[k].value*pi/180.0));
+				}
+				sum += _ptvalue;
+
+				//Find average volume
+				vol += weights_rad[i].weight
+					* weights_len[j].weight
+					* weights_rthick[m].weight
+					* weights_fthick[n].weight
+					* pow(weights_rad[i].value+weights_rthick[m].value,2)
+				*(weights_len[j].value+2.0*weights_fthick[n].value);
+				//Find norm for volume
+				norm_vol += weights_rad[i].weight
+					* weights_len[j].weight
+					* weights_rthick[m].weight
+					* weights_fthick[n].weight;
+
+				norm += weights_rad[i].weight
+					* weights_len[j].weight
+					* weights_rthick[m].weight
+					* weights_fthick[n].weight
+					* weights_theta[k].weight
+					* weights_phi[l].weight;
+
+			  }
+			}
+        }
+      }
+    }
+  }
+  // Averaging in theta needs an extra normalization
+  // factor to account for the sin(theta) term in the
+  // integration (see documentation).
+  if (weights_theta.size()>1) norm = norm / asin(1.0);
+
+  if (vol != 0.0 && norm_vol != 0.0) {
+    //Re-normalize by avg volume
+    sum = sum/(vol/norm_vol);}
+
+  return sum/norm + background();
+}
+
+/**
+ * Function to evaluate 2D scattering function
+ * @param pars: parameters of the cylinder
+ * @param q: q-value
+ * @param phi: angle phi
+ * @return: function value
+ */
+double CoreShellBicelleModel :: evaluate_rphi(double q, double phi) {
+  double qx = q*cos(phi);
+  double qy = q*sin(phi);
+  return (*this).operator()(qx, qy);
+}
+/**
+ * Function to calculate effective radius
+ * @return: effective radius value
+ */
+double CoreShellBicelleModel :: calculate_ER() {
+  CoreShellBicelleParameters dp;
+
+  dp.radius     = radius();
+  dp.rim_thick  = rim_thick();
+  dp.face_thick  = face_thick();
+  dp.length     = length();
+  double rad_out = 0.0;
+
+  // Perform the computation, with all weight points
+  double sum = 0.0;
+  double norm = 0.0;
+
+  // Get the dispersion points for the length
+  vector<WeightPoint> weights_length;
+  length.get_weights(weights_length);
+
+  // Get the dispersion points for the thickness
+  vector<WeightPoint> weights_rthick;
+  rim_thick.get_weights(weights_rthick);
+
+  // Get the dispersion points for the thickness
+  vector<WeightPoint> weights_fthick;
+  face_thick.get_weights(weights_fthick);
+
+  // Get the dispersion points for the radius
+  vector<WeightPoint> weights_radius ;
+  radius.get_weights(weights_radius);
+
+  // Loop over major shell weight points
+  for(int i=0; i< (int)weights_length.size(); i++) {
+    dp.length = weights_length[i].value;
+    for(int j=0; j< (int)weights_rthick.size(); j++) {
+      dp.rim_thick = weights_rthick[j].value;
+      for(int l=0; l< (int)weights_fthick.size(); l++) {
+          dp.face_thick = weights_fthick[l].value;
+		  for(int k=0; k< (int)weights_radius.size(); k++) {
+			dp.radius = weights_radius[k].value;
+			//Note: output of "DiamCyl( )" is DIAMETER.
+			sum +=weights_length[i].weight * weights_rthick[j].weight * weights_fthick[l].weight
+				* weights_radius[k].weight*DiamCyl(dp.length+2.0*dp.face_thick,dp.radius+dp.rim_thick)/2.0;
+			norm += weights_length[i].weight* weights_rthick[j].weight * weights_fthick[l].weight* weights_radius[k].weight;
+		  }
+      }
+    }
+  }
+  if (norm != 0){
+    //return the averaged value
+    rad_out =  sum/norm;}
+  else{
+    //return normal value
+    //Note: output of "DiamCyl()" is DIAMETER.
+    rad_out = DiamCyl(dp.length+2.0*dp.face_thick,dp.radius+dp.rim_thick)/2.0;}
+
+  return rad_out;
+}
Index: sansmodels/src/sans/models/media/model_functions.html
===================================================================
--- sansmodels/src/sans/models/media/model_functions.html	(revision 67529504be577e733fa08fdc95de883624bc886a)
+++ sansmodels/src/sans/models/media/model_functions.html	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
@@ -456,5 +456,5 @@
 </li>
 <li class="MsoNormal" style="line-height: 115%;"><a href="#Shapes"><b>Shapes</b></a>: <a href="#SphereModel">SphereModel</a>, <a href="#BinaryHSModel">BinaryHSModel</a>, <a href="#FuzzySphereModel">FuzzySphereModel</a>, <a href="#CoreShellModel">CoreShellModel</a>,&nbsp;<a href="#Core2ndMomentModel">Core2ndMomentModel</a>, <a href="#CoreMultiShellModel">CoreMultiShellModel</a>, <a href="#VesicleModel">VesicleModel</a>, <a href="#MultiShellModel">MultiShellModel</a>, &nbsp;<a href="#OnionExpShellModel">OnionExpShellModel</a>, <a href="#SphericalSLDModel">SphericalSLDModel</a>, <a href="#LinearPearlsModel">LinearPearlsModel</a>, <a href="#PearlNecklaceModel">PearlNecklaceModel</a> , <a href="#CylinderModel">CylinderModel</a>, <a href="#CoreShellCylinderModel">CoreShellCylinderModel</a>,
-<a href="#HollowCylinderModel">HollowCylinderModel</a>,
+<a href="#CoreShellBicelleModel">CoreShellBicelleModel</a>,<a href="#HollowCylinderModel">HollowCylinderModel</a>,
 <a href="#FlexibleCylinderModel">FlexibleCylinderModel</a>,
 <a href="#FlexibleCylinderModel">FlexCylEllipXModel</a>,
@@ -3340,7 +3340,182 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal">&nbsp;</p>
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.15.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+</span></b><a name="CoreShellBicelleModel"><b><span style="font-size: 14pt;">Core-Shell (Cylinder) Bicelle Model</span></b></a></p>
+<p class="MsoNormal">&nbsp;</p>
+<p class="MsoNormal">This model provides the form factor
+for a circular cylinder
+with a core-shell scattering length density profile. The form factor is
+normalized by the particle volume. This model is a more general case of
+<a href="#CoreShellCylinderModel">
+core-shell cylinder model </a> (see&nbsp;above and reference below) in
+that the parameters of the shell are separated into a face-shell and
+a rim-shell so that users can set different values of the thicknesses
+and slds.&nbsp;</p>
+<p class="MsoNormal"></p>
+<p class="MsoNormal">The returned value is scaled to units
+of [cm<sup>-1</sup>]
+and the parameters of the core-shell cylinder model are the following:</p>
+<p class="MsoNormal">&nbsp;</p>
+<div align="center">
+<table class="MsoNormalTable" style="border-collapse: collapse;" border="2" cellpadding="0" cellspacing="0">
+<tbody>
+<tr style="height: 19.25pt;">
+<td style="border: 1pt solid windowtext; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Parameter name</p>
+</td>
+<td style="border-style: solid solid solid none; border-color: windowtext windowtext windowtext -moz-use-text-color; border-width: 1pt 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Units</p>
+</td>
+<td style="border-style: solid solid solid none; border-color: windowtext windowtext windowtext -moz-use-text-color; border-width: 1pt 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Default value</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">scale</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">None</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">1.0</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">radius</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Å</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">20.0</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">rim_thick</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Å</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">10.0</p>
+</td>
+</tr>
+<tr>
+<td>face_thick</td>
+<td>Å</td>
+<td>10.0</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">length</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Å</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">400.0</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; vertical-align: top; width: 107pt; height: 19.25pt;">
+<p class="MsoBodyText">core_sld</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Å<sup> -2</sup></p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">1e-6</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">rim_sld</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Å<sup> -2</sup></p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">4e-6</p>
+</td>
+</tr>
+<tr>
+<td>face_sld</td>
+<td>Å<sup> -2</sup></td>
+<td>4e-6</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">solvent_sld</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">Å<sup> -2</sup></p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">1e-6</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">background</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">cm<sup>-1</sup></p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">0.0</p>
+</td>
+</tr>
+<tr style="height: 19.25pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">axis_theta</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">degree</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
+<p class="MsoBodyText">90</p>
+</td>
+</tr>
+<tr style="height: 20pt;">
+<td style="border-style: none solid solid; border-color: -moz-use-text-color windowtext windowtext; border-width: medium 1pt 1pt; padding: 0in 5.4pt; width: 107pt; height: 20pt;" valign="top" width="143">
+<p class="MsoBodyText">axis_phi</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 20pt;" valign="top" width="143">
+<p class="MsoBodyText">degree</p>
+</td>
+<td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 20pt;" valign="top" width="143">
+<p class="MsoBodyText">0.0</p>
+</td>
+</tr>
+</tbody>
+</table>
+</div>
+<p class="MsoNormal">&nbsp;</p>
+<p class="MsoNormal">The output of the 1D scattering
+intensity function for
+randomly oriented cylinders is then given by the equation above.</p>
+<p class="MsoNormal">&nbsp;</p>
+<p class="MsoNormal">The <i>axis_theta</i>
+and axis<i>_phi</i> parameters are not
+used for the 1D output. Our implementation of the scattering kernel and
+the 1D
+scattering intensity use the c-library from NIST.</p>
+<p class="MsoNormal"></p>
+<p class="MsoNormal">&nbsp;</p>
+<p class="MsoNormal">&nbsp;</p>
+<p class="MsoNormal" style="text-align: center;" align="center"><img style="width: 512px; height: 377px;" id="cscylbicelle" src="cscylbicelle_pic.jpg"></p>
+<p class="MsoNormal" style="text-align: center;" align="center"><b>Figure.
+1D plot using the default values (w/200 data point).</b></p>
+<p class="MsoNormal" style="text-align: center;" align="center">&nbsp;</p>
+<p class="MsoNormal" style="text-align: center;" align="center">&nbsp;</p>
+<p class="MsoNormal">&nbsp;REFERENCE<br>
+Feigin, L. A, and D. I. Svergun, "Structure Analysis by Small-Angle
+X-Ray and Neutron Scattering", Plenum Press, New York, (1987).</p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.15.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.16.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="HollowCylinderModel"><b><span style="font-size: 14pt;">HollowCylinderModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -3509,5 +3684,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.16.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.17.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="FlexibleCylinderModel"></a><b><span style="font-size: 14pt;">FlexibleCylinderModel</span></b></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -3672,5 +3847,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal">&nbsp;</p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.17.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.18.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><b><span style="font-size: 14pt;">FlexCylEllipXMo<a name="FlexCylEllipXModel"></a>del</span></b></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -3899,5 +4074,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.18.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.19.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="StackedDisksModel"><b><span style="font-size: 14pt;">StackedDisksModel
 </span></b></a></p>
@@ -4143,5 +4318,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.19.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.20.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="ParallelepipedModel"><b><span style="font-size: 14pt;">ParallelepipedModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -4338,5 +4513,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.20.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.21.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><b><span style="font-size: 14pt;"><a name="CSParallelepipedModel">CSParallelepipedModel</a></span></b></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -4647,5 +4822,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal">&nbsp;</p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.21.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.22.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="EllipticalCylinderModel"><b><span style="font-size: 14pt;">Elliptical
 Cylinder Model</span></b></a></p>
@@ -4881,5 +5056,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal">&nbsp;</p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.22.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.23.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="BarBellModel"><b><span style="font-size: 14pt;">BarBell(/DumBell)Model</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -5089,5 +5264,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal">&nbsp;</p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.23.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.24.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="CappedCylinderModel"><b><span style="font-size: 14pt;">CappedCylinder(/ConvexLens)Model</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -5292,5 +5467,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal">&nbsp;</p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.24.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.25.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="EllipsoidModel"><b><span style="font-size: 14pt;">Ellipsoid
 Model</span></b></a></p>
@@ -5548,5 +5723,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.25.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.26.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="CoreShellEllipsoidModel"><b><span style="font-size: 14pt;">CoreShellEllipsoidModel
 </span></b></a></p>
@@ -5745,5 +5920,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.26.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.27.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="TriaxialEllipsoidModel"><b><span style="font-size: 14pt;">TriaxialEllipsoidModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -5942,5 +6117,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.27.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.28.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="LamellarModel"><b><span style="font-size: 14pt;">LamellarModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -6066,5 +6241,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.28.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.29.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="LamellarFFHGModel"><b><span style="font-size: 14pt;">LamellarFFHGModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -6219,5 +6394,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.29.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.30.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="LamellarPSModel"><b><span style="font-size: 14pt;">LamellarPSModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -6385,5 +6560,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.30.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.31.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="LamellarPSHGModel"><b><span style="font-size: 14pt;">LamellarPSHGModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -6589,5 +6764,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.31.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.32.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="LamellarPCrystalModel"><b><span style="font-size: 14pt;">LamellarPCrystalModel</span></b></a></p>
 <p class="MsoNormal">&nbsp;</p>
@@ -6762,5 +6937,5 @@
 <p class="MsoNormal"><b>&nbsp;</b></p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.32.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.33.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="SCCrystalModel"><b><span style="font-size: 14pt;">SC(Simple
 Cubic Para-)CrystalModel</span></b></a></p>
@@ -6980,5 +7155,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.33.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.34.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="FCCrystalModel"><b><span style="font-size: 14pt;">FC(Face
 Centered Cubic Para-)CrystalModel</span></b></a></p>
@@ -7204,5 +7379,5 @@
 <p class="MsoNormal">&nbsp;</p>
 <p class="MsoNormal"><b>&nbsp;</b></p>
-<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.34.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+<p class="MsoNormal" style="margin-left: 0.55in; text-indent: -0.3in;"><b><span style="font-size: 14pt;">2.35.</span></b><b><span style="font-size: 7pt;">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
 </span></b><a name="BCCrystalModel"><b><span style="font-size: 14pt;">BC(Body
 Centered Cubic Para-)CrystalModel</span></b></a></p>
@@ -8347,5 +8522,6 @@
 </td>
 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
-<p class="MsoBodyText"><br><sup></sup></p>
+<p class="MsoBodyText"><br>
+</p>
 </td>
 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
@@ -8395,5 +8571,6 @@
 <p class="MsoNormal" style="margin-left: 0.25in;">&nbsp;Note:
 &nbsp;The surface fractal dimension is valid for
-1&lt;surface_dim&lt;3. &nbsp;Also it is valid in a limited q range (see the reference for details).</p>
+1&lt;surface_dim&lt;3. &nbsp;Also it is valid in a limited
+q range (see the reference for details).</p>
 <p class="MsoNormal" style="text-align: center;" align="center"><span style="font-size: 14pt;">&nbsp;</span></p>
 <div align="center">
@@ -8460,5 +8637,6 @@
 </td>
 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
-<p class="MsoBodyText"><br><sup></sup></p>
+<p class="MsoBodyText"><br>
+</p>
 </td>
 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
@@ -8574,5 +8752,6 @@
 </td>
 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
-<p class="MsoBodyText"><br><sup></sup></p>
+<p class="MsoBodyText"><br>
+</p>
 </td>
 <td style="border-style: none solid solid none; border-color: -moz-use-text-color windowtext windowtext -moz-use-text-color; border-width: medium 1pt 1pt medium; padding: 0in 5.4pt; width: 107pt; height: 19.25pt;" valign="top" width="143">
Index: sansmodels/test/utest_other_models.py
===================================================================
--- sansmodels/test/utest_other_models.py	(revision 9fafa3908ba717b78e055d4b9279d1dbdfbe180a)
+++ sansmodels/test/utest_other_models.py	(revision 543d1bdf2522521f8b1cf13fbbdd48ab4631fe09)
@@ -272,5 +272,25 @@
     #    self.assert_(numpy.isfinite(self.comp.run(0.0)))
  
- 
+     
+class TestCoreShellBicelleModel(unittest.TestCase):
+    """ Unit tests for CoreShellBicelle Model"""
+    
+    def setUp(self):
+        from sans.models.CoreShellCylinderModel import CoreShellCylinderModel
+        from sans.models.CoreShellBicelleModel import CoreShellBicelleModel
+        self.comp1 = CoreShellCylinderModel()
+        self.comp2 = CoreShellBicelleModel()
+        # Using the default values of CSBiselle is same as CSCylinder
+        
+    def testcompare1D(self):
+        """ Test 1D model for a CoreShellBicelle Model"""
+        self.assertAlmostEqual(self.comp1.run(0.01), self.comp2.run(0.01), 8)
+        
+    def testcompareEval_2D(self):
+        """ Test 2D model for a CoreShellBicelle with evalDistribution"""
+        self.assertAlmostEquals(self.comp1.runXY([0.4, 0.5]),self.comp2.runXY([0.4, 0.5]),8)
+        self.assertAlmostEquals(self.comp1.runXY([1.3,1.57]),self.comp2.runXY([1.3,1.57]),8)
+        
+                      
 class TestHollowCylinderModel(unittest.TestCase):
     """ Unit tests for HollowCylinder Model"""
@@ -318,5 +338,5 @@
         """ Test 2D model for a HollowCylinder with evalDistribution"""
         self.assertAlmostEquals(self.comp.runXY([0.4, 0.5]),self.xy_matrix[0],8)
-        self.assertAlmostEquals(self.comp.runXY([1.3,1.57]),self.xy_matrix[1], 8)
+        self.assertAlmostEquals(self.comp.runXY([1.3,1.57]),self.xy_matrix[1],8)
 
     # No more singular point    
