Changeset 83db1cc in sasview for src/sas/sascalc

Timestamp:

Sep 27, 2017 10:49:33 AM (7 years ago)

Author:

Paul Kienzle <pkienzle@…>

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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

fca1f50, ae2f623

Parents:

66000ae (diff), 38a1e63 (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 'ticket-869' into ticket-887-reorg

Location:

src/sas/sascalc

Files:

• corfunc/corfunc_calculator.py (modified) (1 diff)
• dataloader/readers/__init__.py (modified) (1 diff)

src/sas/sascalc/corfunc/corfunc_calculator.py

@@ -124 +124 @@
 
         params, s2 = self._fit_data(q, iq)
+        # Extrapolate to 100*Qmax in experimental data
         qs = np.arange(0, q[-1]*100, (q[1]-q[0]))
         iqs = s2(qs)

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

@@ -1 +1 @@
 # Method to associate extensions to default readers
 from associations import read_associations
-
-
-# Method to return the location of the XML settings file
-def get_data_path():
-    """
-        Return the location of the settings file for the data readers.
-    """
-    import os
-    return os.path.dirname(__file__)