Changeset c31dcdb1 in sasview

Timestamp:

Mar 29, 2016 3:53:15 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:

b6c8abe

Parents:

273a6d7 (diff), 8e7044c (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

Files:

• check_packages.py (modified) (1 diff)
• setup.py (modified) (3 diffs)
• src/sas/sascalc/calculator/c_extensions/libfunc.c (modified) (7 diffs)

check_packages.py

@@ -19 +19 @@
     'pylint':{'version':None,'import_name':'pylint','test':None},
     'periodictable':{'version':'1.3.0','import_name':'periodictable','test':'__version__'},
-    'bumps':{'version':'0.7.5.6','import_name':'bumps','test':'__version__'},
+    'bumps':{'version':'0.7.5.7','import_name':'bumps','test':'__version__'},
     'numpy':{'version':'1.6.1','import_name':'numpy','test':'__version__'},
     'scipy':{'version':'0.10.1','import_name':'scipy','test':'__version__'},

setup.py

@@ -5 +5 @@
 import sys
 import os
+import shutil
 from setuptools import setup, Extension
 from distutils.command.build_ext import build_ext
 from distutils.core import Command
+from shutil import rmtree
 
 try:
@@ -42 +44 @@
 #                      'sum_Ap1_1_Ap2.pyc', 'sum_p1_p2.pyc',
 #                      'testmodel_2.pyc', 'testmodel.pyc', 'plugins.log']
+
+CURRENT_SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
+SASVIEW_BUILD = os.path.join(CURRENT_SCRIPT_DIR, "build")
+
 sas_dir = os.path.join(os.path.expanduser("~"),'.sasview')
 if os.path.isdir(sas_dir):
@@ -59 +65 @@
     #             file_path =  os.path.join(f_path, f)
     #             os.remove(file_path)
+    if os.path.exists(SASVIEW_BUILD):
+        print "Removing existing build directory", SASVIEW_BUILD, "for a clean build"
+        shutil.rmtree(SASVIEW_BUILD)
                     
 # 'sys.maxsize' and 64bit: Not supported for python2.5

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);
 }
-