Changeset b85502d in sasview for src/sas

Timestamp:

Mar 20, 2016 6:04:20 PM (9 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:

832fea2

Parents:

9e531f2 (diff), 5f5c596 (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

Location:

src/sas

Files:

• sasgui/guiframe/CategoryInstaller.py (modified) (3 diffs)
• sascalc/calculator/BaseComponent.py (added)
• sascalc/calculator/c_extensions/__init__.py (added)
• sascalc/calculator/c_extensions/libfunc.c (moved) (moved from src/sas/models/c_extension/c_models/libfunc.c) (1 diff)
• sascalc/calculator/c_extensions/libfunc.h (moved) (moved from src/sas/models/include/libmultifunc/libfunc.h)
• sascalc/calculator/c_extensions/librefl.c (moved) (moved from src/sas/models/c_extension/c_models/librefl.c) (1 diff)
• sascalc/calculator/c_extensions/librefl.h (moved) (moved from src/sas/models/include/libmultifunc/librefl.h)
• sascalc/calculator/c_extensions/sld2i.cpp (moved) (moved from src/sas/models/c_extension/c_gen/sld2i.cpp) (1 diff)
• sascalc/calculator/c_extensions/sld2i.hh (moved) (moved from src/sas/models/c_extension/c_gen/sld2i.hh)
• sascalc/calculator/c_extensions/sld2i_module.cpp (moved) (moved from src/sas/models/c_extension/c_gen/sld2i_module.cpp)
• sascalc/calculator/c_extensions/winFuncs.c (moved) (moved from src/sas/models/c_extension/libigor/winFuncs.c)
• sascalc/calculator/c_extensions/winFuncs.h (moved) (moved from src/sas/models/c_extension/libigor/winFuncs.h)
• sascalc/calculator/sas_gen.py (modified) (1 diff)
• sascalc/fit/pluginmodel.py (added)
• sasgui/perspectives/fitting/__init__.py (modified) (1 diff)
• sasgui/perspectives/fitting/models.py (modified) (1 diff)

src/sas/sasgui/guiframe/CategoryInstaller.py

@@ -15 +15 @@
 from collections import defaultdict
 
-USER_FILE = 'serialized_cat.json'
+USER_FILE = 'categories.json'
 
 class CategoryInstaller:
@@ -111 +111 @@
     def get_user_file():
         """
-        returns the user data file, eg .sasview/serialized_cat.json
+        returns the user data file, eg .sasview/categories.json.json
         """
         return os.path.join(CategoryInstaller._get_home_dir(),
@@ -129 +129 @@
         """
         the main method of this class
-        makes sure serialized_cat.json exists and if not
+        makes sure categories.json exists and if not
         compile it and install
         :param homefile: Override the default home directory

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

@@ -3 +3 @@
 #include <math.h>
 
-#include "libmultifunc/libfunc.h"
+#include "libfunc.h"
 
 #include <stdio.h>

src/sas/sascalc/calculator/c_extensions/librefl.c

@@ -4 +4 @@
 
 #include <math.h>
-#include "libmultifunc/librefl.h"
+#include "librefl.h"
 #include <stdio.h>
 #include <stdlib.h>
 #if defined(_MSC_VER)
-#include "../libigor/winFuncs.h"
+#include "winFuncs.h"
 #endif
 

src/sas/sascalc/calculator/c_extensions/sld2i.cpp

@@ -7 +7 @@
 using namespace std;
 extern "C" {
-        #include "libmultifunc/libfunc.h"
-        #include "libmultifunc/librefl.h"
+        #include "libfunc.h"
+        #include "librefl.h"
 }
 /**

src/sas/sascalc/calculator/sas_gen.py

@@ -3 +3 @@
 SAS generic computation and sld file readers
 """
-from sas.models.BaseComponent import BaseComponent
-import sas.models.sas_extension.sld2i as mod
+from sas.sascalc.calculator.BaseComponent import BaseComponent
+import sas.sascalc.calculator.core.sld2i as mod
 from periodictable import formula
 from periodictable import nsf

src/sas/sasgui/perspectives/fitting/__init__.py

@@ -39 +39 @@
     data_files = []
     path = os.path.dirname(__file__)
-    p_path = os.path.join(path, 'plugin_models')
-    for f in findall(p_path):
-        data_files.append(('plugin_models', [f]))
-    path = get_data_path(media="media")
+    # p_path = os.path.join(path, 'plugin_models')
+    # for f in findall(p_path):
+    #     data_files.append(('plugin_models', [f]))
+    # path = get_data_path(media="media")
     for f in findall(path):
         data_files.append(('media/fitting_media', [f]))

src/sas/sasgui/perspectives/fitting/models.py

@@ -17 +17 @@
 # places it in the distribution. The Model1DPlugin class is used
 # as the base class of plug-in models.
-from sas.models.pluginmodel import Model1DPlugin
-from sas.models.BaseComponent import BaseComponent
+from sas.sascalc.fit.pluginmodel import Model1DPlugin
+from sas.sascalc.calculator.BaseComponent import BaseComponent
 from sas.sasgui.guiframe.CategoryInstaller import CategoryInstaller
 from sasmodels import sasview_model,core