Changeset 273a6d7 in sasview for src

Timestamp:

Mar 24, 2016 3:38:02 AM (9 years ago)

Author:

wojciech

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

c31dcdb1

Parents:

197260f (diff), e81f6dd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of ​https://github.com/SasView/sasview

Location:

src/sas

Files:

• sascalc/calculator/BaseComponent.py (modified) (1 diff)
• sasgui/guiframe/data_processor.py (modified) (2 diffs)
• sasgui/perspectives/calculator/media/gen_gui_help.bmp (modified) (previous)
• sasgui/perspectives/calculator/media/mag_vector.bmp (modified) (previous)
• sasgui/perspectives/fitting/media/mag_vector.bmp (modified) (previous)
• sasgui/perspectives/fitting/media/new_model.bmp (modified) (previous)
• sasgui/perspectives/fitting/media/plot_button.bmp (modified) (previous)
• sasgui/perspectives/fitting/media/view_button.bmp (modified) (previous)
• sascalc/calculator/c_extensions/libfunc.c (modified) (7 diffs)

src/sas/sascalc/calculator/BaseComponent.py

@@ -119 +119 @@
             q = [q[0], q[1], q[2], ....]
 
-        ..note::
-          Due to 2D speed issue, no anisotropic scattering
-          is supported for python models, thus C-models should have
-          their own evalDistribution methods.
+        .. note:: Due to 2D speed issue, no anisotropic scattering
+                  is supported for python models, thus C-models should have
+                  their own evalDistribution methods.
 
         The method is then called the following way: ::

src/sas/sasgui/guiframe/data_processor.py

@@ -10 +10 @@
 The organization of the classes goes as:
 
-#Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py
-#Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
-
-.. image:: ./guiframe/media/BatchGridClassLayout.png
+.. note:: Path to this is: /sasview/src/sas/sasgui/guiframe/data_processor.py
+
+.. note:: Path to image is: /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png
+
+.. image:: ../../user/sasgui/guiframe/BatchGridClassLayout.png
    :align: center
 
@@ -156 +157 @@
         attribute.
 
-        NOTE: There is no need to override this if you don't need
-        to do something out of the ordinary.
+        .. note:: There is no need to override this if you don't need
+                  to do something out of the ordinary.
 
         :param dc: the wxDC object for the paint

src/sas/sascalc/calculator/c_extensions/libfunc.c

@@ -87 +87 @@
 }
 
-
+/*
 double gamln(double xx) {
 
@@ -103 +103 @@
     return -tmp+log(2.5066282746310005*ser/x);
 }
-
+*/
 // calculate magnetic sld and return total sld
 // bn : contrast (not just sld of the layer)
@@ -236 +236 @@
 
 /**
-   Implements eq 6.2.5 (small gamma) of Numerical Recipes in C, essentially
-   the incomplete gamma function multiplied by the gamma function.
-   Required for implementation of fast error function (erf)
+Wojtek's comment Mar 22 2016: The remaing code can mostly likely be deleated
+Keeping it in order to check if it is not breaking anything
 **/
 
@@ -250 +249 @@
   float sum,del,ap;
 
-  *gln = gamln(a);
+  *gln = lgamma(a);
   if(x <= 0.0) {
     if (x < 0.0) printf("Error: x less than 0 in routine gser");
@@ -280 +279 @@
    representation
 **/
-
 void gcf(float *gammcf, float a, float x, float *gln) {
   int i;
   float an,b,c,d,del,h;
 
-  *gln = gamln(a);
+  *gln = lgamma(a);
   b = x+1.0-a;
   c = 1.0/FPMIN;
@@ -307 +305 @@
 }
 
-
 /**
    Represents incomplete error function, P(a,x)
@@ -322 +319 @@
   }
 }
-
 /**
     Implementation of the error function, erf(x)
 **/
-
 float erff(float x) {
   return x < 0.0 ? -gammp(0.5,x*x) : gammp(0.5,x*x);
 }
-