Changeset 273a6d7 in sasview


Ignore:
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

Files:
12 edited

Legend:

Unmodified
Added
Removed

  • docs/sphinx-docs/build_sphinx.py

    r5420ef6 r6de5e10  
    150150    if os.path.exists(SASMODELS_SOURCE_IMG): 
    151151        print "Found img  folder SASMODELS_SOURCE_IMG    at ", SASMODELS_SOURCE_IMG 
    152         if os.path.exists(SASMODELS_DEST_IMG): 
    153             print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG 
    154             print "Copying sasmodels model image files..." 
    155             for files in os.listdir(SASMODELS_SOURCE_IMG): 
    156                 fromhere=os.path.join(SASMODELS_SOURCE_IMG,files) 
    157                 tohere=os.path.join(SASMODELS_DEST_IMG,files) 
    158                 shutil.copy(fromhere,tohere) 
     152        if not os.path.exists(SASMODELS_DEST_IMG): 
     153            print "Missing docs folder SASMODELS_DEST_IMG at ", SASMODELS_DEST_IMG 
     154            os.makedirs(SASMODELS_DEST_IMG) 
     155            print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG 
     156        else: print "Found img  folder SASMODELS_DEST_IMG      at ", SASMODELS_DEST_IMG 
     157        print "Copying sasmodels model image files..." 
     158        for files in os.listdir(SASMODELS_SOURCE_IMG): 
     159            fromhere=os.path.join(SASMODELS_SOURCE_IMG,files) 
     160            tohere=os.path.join(SASMODELS_DEST_IMG,files) 
     161            shutil.copy(fromhere,tohere) 
     162    else: print "cannot find SASMODELS_SOURCE_IMG", SASMODELS_SOURCE_IMG 
    159163 
    160164    if os.path.exists(SASMODELS_SOURCE_AUTOIMG): 
    161165        print "Found img  folder SASMODELS_SOURCE_AUTOIMG    at ", SASMODELS_SOURCE_AUTOIMG 
    162         if os.path.exists(SASMODELS_DEST_IMG): 
    163             print "Copying sasmodels model auto-generated image files..." 
    164             for files in os.listdir(SASMODELS_SOURCE_AUTOIMG): 
    165                 fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files) 
    166                 tohere=os.path.join(SASMODELS_DEST_IMG,files) 
    167                 shutil.copy(fromhere,tohere) 
     166        if not os.path.exists(SASMODELS_DEST_IMG): 
     167            print "Missing docs folder SASMODELS_DEST_IMG at ", ASMODELS_DEST_IMG 
     168            os.makedirs(SASMODELS_DEST_BUILDIMG) 
     169            print "created SASMODELS_DEST_BUILDIMG at ", SASMODELS_DEST_BUILDIMG 
     170        print "Copying sasmodels model auto-generated image files..." 
     171        for files in os.listdir(SASMODELS_SOURCE_AUTOIMG): 
     172            fromhere=os.path.join(SASMODELS_SOURCE_AUTOIMG,files) 
     173            tohere=os.path.join(SASMODELS_DEST_IMG,files) 
     174            shutil.copy(fromhere,tohere) 
     175        else: print "no source directorty",SASMODELS_SOURCE_AUTOIMG ,"was found" 
    168176     
    169177    # And the rst prolog with the unit substitutions 

  • docs/sphinx-docs/source/user/sasgui/perspectives/fitting/optimizer.rst

    r49148bb re81f6dd  
    404404Like differential evolution, DREAM will evaluate $k$ points in parallel, 
    405405where $k$ is the size of the population. 
     406 
     407.. _option-burn: 
    406408 
    407409Options 

  • docs/sphinx-docs/source/user/shape-sphere.rst

    r61991ed r5e15bca  
    1212    models/adsorbed_layer.rst 
    1313    models/binary_hard_sphere.rst 
     14    models/core_multi_shell.rst 
    1415    models/core_shell_sphere.rst 
    1516    models/fuzzy_sphere.rst 

  • src/sas/sascalc/calculator/BaseComponent.py

    r74c5521 r53aa66d  
    119119            q = [q[0], q[1], q[2], ....] 
    120120 
    121         ..note:: 
    122           Due to 2D speed issue, no anisotropic scattering 
    123           is supported for python models, thus C-models should have 
    124           their own evalDistribution methods. 
     121        .. note:: Due to 2D speed issue, no anisotropic scattering 
     122                  is supported for python models, thus C-models should have 
     123                  their own evalDistribution methods. 
    125124 
    126125        The method is then called the following way: :: 

  • src/sas/sasgui/guiframe/data_processor.py

    r74c5521 r468c253  
    1010The organization of the classes goes as: 
    1111 
    12 #Path to this is:           /sasview/src/sas/sasgui/guiframe/data_processor.py 
    13 #Path to image is:          /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png 
    14  
    15 .. image:: ./guiframe/media/BatchGridClassLayout.png 
     12.. note:: Path to this is: /sasview/src/sas/sasgui/guiframe/data_processor.py 
     13 
     14.. note:: Path to image is: /sasview/src/sas/sasgui/guiframe/media/BatchGridClassLayout.png 
     15 
     16.. image:: ../../user/sasgui/guiframe/BatchGridClassLayout.png 
    1617   :align: center 
    1718 
    … …  
    156157        attribute. 
    157158 
    158         NOTE: There is no need to override this if you don't need 
    159         to do something out of the ordinary. 
     159        .. note:: There is no need to override this if you don't need 
     160                  to do something out of the ordinary. 
    160161 
    161162        :param dc: the wxDC object for the paint 

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

    r9e531f2 r197260f  
    8787} 
    8888 
    89  
     89/* 
    9090double gamln(double xx) { 
    9191 
    … …  
    103103    return -tmp+log(2.5066282746310005*ser/x); 
    104104} 
    105  
     105*/ 
    106106// calculate magnetic sld and return total sld 
    107107// bn : contrast (not just sld of the layer) 
    … …  
    236236 
    237237/** 
    238    Implements eq 6.2.5 (small gamma) of Numerical Recipes in C, essentially 
    239    the incomplete gamma function multiplied by the gamma function. 
    240    Required for implementation of fast error function (erf) 
     238Wojtek's comment Mar 22 2016: The remaing code can mostly likely be deleated 
     239Keeping it in order to check if it is not breaking anything 
    241240**/ 
    242241 
    … …  
    250249  float sum,del,ap; 
    251250 
    252   *gln = gamln(a); 
     251  *gln = lgamma(a); 
    253252  if(x <= 0.0) { 
    254253    if (x < 0.0) printf("Error: x less than 0 in routine gser"); 
    … …  
    280279   representation 
    281280**/ 
    282  
    283281void gcf(float *gammcf, float a, float x, float *gln) { 
    284282  int i; 
    285283  float an,b,c,d,del,h; 
    286284 
    287   *gln = gamln(a); 
     285  *gln = lgamma(a); 
    288286  b = x+1.0-a; 
    289287  c = 1.0/FPMIN; 
    … …  
    307305} 
    308306 
    309  
    310307/** 
    311308   Represents incomplete error function, P(a,x) 
    … …  
    322319  } 
    323320} 
    324  
    325321/** 
    326322    Implementation of the error function, erf(x) 
    327323**/ 
    328  
    329324float erff(float x) { 
    330325  return x < 0.0 ? -gammp(0.5,x*x) : gammp(0.5,x*x); 
    331326} 
    332  
Note: See TracChangeset for help on using the changeset viewer.