Changeset 05fb3d6b in sasview

Timestamp:

Mar 19, 2016 4:59:54 AM (8 years ago)

Author:

krzywon

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:

ef908db, a407a40

Parents:

3689302 (diff), 354524d (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 remote-tracking branch 'origin/master'

Files:

• docs/sphinx-docs/build_sphinx.py (modified) (5 diffs)
• src/sas/sascalc/dataloader/readers/sesans_reader.py (modified) (1 diff)

docs/sphinx-docs/build_sphinx.py

@@ -35 +35 @@
 #/sasview-local-trunk/docs/sphinx-docs/build_sphinx.py
 
-SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "sasmodels", "models")
-SASMODELS_SOURCE_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "sasmodels", "models", "img")
-SASMODELS_DEST_MODELS = os.path.join(SASVIEW_SRC, "sas", "models", "media")
+SASMODELS_SOURCE_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model")
+SASMODELS_SOURCE_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "..", "sasmodels", "doc", "model", "img")
+SASMODELS_DEST_MODELS = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "src", "sas", "models", "media")
 SASMODELS_DEST_IMG = os.path.join(CURRENT_SCRIPT_DIR, "..", "..", "src", "sas", "models", "media", "img")
 
@@ -79 +79 @@
     _remove_dir(SPHINX_SOURCE_TEST)
 
+
 def retrieve_user_docs():
     """
@@ -114 +115 @@
 #    print os.path.abspath(SASVIEW_TEST)
 #    print os.path.abspath(SPHINX_SOURCE_TEST)
+    print "=== Including Test Data Docs ==="
     if os.path.exists(SASVIEW_TEST):
        print "Found docs folder at ", SASVIEW_TEST
        shutil.copytree(SASVIEW_TEST, SPHINX_SOURCE_TEST)       
-       
+
+    print "=== And the Sasmodels Docs ===" 
     # Make sure we have the relevant images for the new sasmodels documentation
     if os.path.exists(SASMODELS_SOURCE_IMG):
@@ -128 +131 @@
                 shutil.copy(fromhere,tohere)
 
-    # And the relevant .py files with the rst descriptions for the new sasmodels documentation
+    # And the relevant rst descriptions for the new sasmodels documentation
     if os.path.exists(SASMODELS_SOURCE_MODELS):
         print "Found docs folder SASMODELS_SOURCE_MODELS at ", SASMODELS_SOURCE_MODELS
@@ -134 +137 @@
             print "Found docs folder SASMODELS_DEST_MODELS   at ", SASMODELS_DEST_MODELS
             for files in os.listdir(SASMODELS_SOURCE_MODELS):
-                if files.endswith(".py"):
+                if files.endswith(".rst"):
                     fromhere=os.path.join(SASMODELS_SOURCE_MODELS,files)
                     tohere=os.path.join(SASMODELS_DEST_MODELS,files)

src/sas/sascalc/dataloader/readers/sesans_reader.py

@@ -178 +178 @@
                 output.sample.name = paramvals[1]
                 output.sample.ID = paramvals[0]
+                zaccept_unit_split = paramnames[7].split("[")
+                zaccept_unit = zaccept_unit_split[1].replace("]","")
+                if zaccept_unit.strip() == '\AA^-1':
+                    zaccept_unit = "1/A"
                 output.sample.zacceptance=float(paramvals[7])
+                output.sample.zacceptance=self._unit_conversion(output.sample.zacceptance,
+                                                                zaccept_unit, "1/" + default_z_unit)
                 output.vars=varheader