Changeset cfe472e in sasview

Timestamp:

Feb 27, 2015 10:33:57 PM (9 years ago)

Author:

butler

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:

3f5d75b

Parents:

906a325 (diff), 4ddf30e4 (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.git

Files:

• build_tools/get_version.py (deleted)
• build_tools/jenkins_linux_build.sh (modified) (1 diff)
• build_tools/rpm/create_rpm_spec.py (deleted)
• build_tools/rpm/sasview.spec.template (deleted)
• sasview/__init__.py (modified) (1 diff)
• src/sas/perspectives/fitting/fitting.py (modified) (1 diff)
• src/sas/models/media/model_functions.rst (modified) (1 diff)

build_tools/jenkins_linux_build.sh

@@ -24 +24 @@
 
 cd $WORKSPACE/dist
-ln -s sasview*.egg sasview.egg || true
-$EASY_INSTALL -N -d ../sasview-install sasview.egg
+# ln -s sasview*.egg sasview.egg || true
+$EASY_INSTALL -N -d ../sasview-install sasview*.egg
 

sasview/__init__.py

@@ -6 +6 @@
     __build__ = str(d.version)
 except:
-    try:
-        import os
-        dir = os.path.dirname(__file__)
-        filepath = os.path.join(dir, "BUILD_NUMBER")
-        if os.path.isfile(filepath):
-            f=open(filepath, 'r')
-            buff = f.read().strip()
-            if len(buff)<50:
-                __build__ = buff
-    except:
-        import logging
-        import sys
-        logging.warning("Error while determining build number\n  %s" % sys.exc_value)
+    import logging
+    import sys
+    logging.warning("Error while determining build number\n  %s" % sys.exc_value)

src/sas/perspectives/fitting/fitting.py

@@ -523 +523 @@
         self.fit_panel.clear_panel()
         
-    def set_default_perspective(self):
-        """
-        Call back method that True to notify the parent that the current plug-in
-        can be set as default perspective.
-        when returning False, the plug-in is not candidate for an automatic
-        default perspective setting
-        """
-        return True
-    
     def delete_data(self, data):
         """

src/sas/models/media/model_functions.rst

@@ -4800 +4800 @@
 **2.3.3. HayterMSAStructure Factor**
 
-This calculates the structure factor (the Fourier transform of the pair correlation function *g(r)*) for a system of
-charged, spheroidal objects in a dielectric medium. When combined with an appropriate form factor (such as sphere,
-core+shell, ellipsoid, etc), this allows for inclusion of the interparticle interference effects due to screened coulomb
-repulsion between charged particles.
+This is an implementation of the Rescaled Mean Spherical Approximation which calculates the structure factor (the 
+Fourier transform of the pair correlation function *g(r)*) for a system of charged, spheroidal objects in a
+dielectric medium. When combined with an appropriate form factor (such as sphere,core+shell, ellipsoid, etc), this
+allows for inclusion of the interparticle interference effects due to screened coulomb repulsion between charged particles.
 
 **This routine only works for charged particles**. If the charge is set to zero the routine will self-destruct!