Changeset 0496031 in sasmodels

Timestamp:

Sep 4, 2014 8:31:40 AM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6ce1a29

Parents:

abb22f4

Message:

add theme to doc

Files:

• doc/_static/haiku-site.css (added)
• doc/conf.py (modified) (1 diff)
• sasmodels/models/cylinder.c (modified) (2 diffs)

doc/conf.py

@@ -109 +109 @@
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
-html_theme = 'default'
-html_theme_options = {
-    "rightsidebar":"False",
-    "relbarbgcolor": "Gainsboro",
-    #"codebgcolor": "Beige",
-    "footertextcolor": "orange",
-    "relbartextcolor": "Blue",
-    "sidebarbgcolor": "white",
-    "sidebarlinkcolor": "OrangeRed",
-    "sidebartextcolor": "Navy",
-    "linkcolor": "Blue",
-    "relbarlinkcolor": "Blue"
-    #"headtextcolor": "Teal"
-    #"headbgcolor": "Oldlace",
-}
-
-html_style = 'site.css'
+html_theme = 'haiku'
+html_theme_options = {}
+
+html_style = 'haiku-site.css'
 
 # Theme options are theme-specific and customize the look and feel of a theme

sasmodels/models/cylinder.c

@@ -61 +61 @@
     // Compute angle alpha between q and the cylinder axis
     SINCOS(theta*M_PI_180, sn, cn);
-    // # The following correction factor exists in sasview, but it can't be
-    // # right, so we are leaving it out for now.
-    // const real correction = fabs(cn)*M_PI_2;
     const real q = sqrt(qx*qx+qy*qy);
     const real cos_val = cn*cos(phi*M_PI_180)*(qx/q) + sn*(qy/q);
@@ -71 +68 @@
     SINCOS(alpha, sn, cn);
     const real fq = _cyl(twovd, q*radius*sn, q*REAL(0.5)*length*cn);
-    return REAL(1.0e-4) * fq * fq; // * correction;
+    return REAL(1.0e-4) * fq * fq;
 }