Changes in / [9616dfe:dbf1a60] in sasmodels

Files:

• example/multiscatfit.py (modified) (2 diffs)
• explore/multiscat.py (added)
• sasmodels/bumps_model.py (modified) (3 diffs)
• sasmodels/kerneldll.py (modified) (3 diffs)
• sasmodels/multiscat.py (deleted)

example/multiscatfit.py

@@ -34 +34 @@
 from sasmodels.data import load_data, set_beam_stop, set_top
 
-from sasmodels.multiscat import MultipleScattering
+from multiscat import MultipleScattering
 
 ## Load the data
 #data = load_data('DEC07267.DAT')
 #set_beam_stop(data, 0.003, outer=0.025)
-data = load_data('latex_smeared.xml', index=0)
+data = load_data('latex_smeared.xml', index=1)
 
 ## Define the model
@@ -66 +66 @@
 
 # Mulitple scattering probability parameter
-# HACK: the probability is stuffed in as an extra parameter to the experiment.
+# HACK: the parameter is assigned to model.theta, which is otherwise unused
+# since the dataset is 1D; this won't work for 2D data
 probability = Parameter(name="probability", value=0.0)
 probability.range(0.0, 0.9)
+model.phi = probability
 
-M = Experiment(data=data, model=model, extra_pars={'probability': probability})
+M = Experiment(data=data, model=model)
 
 # Stack mulitple scattering on top of the existing resolution function.

sasmodels/bumps_model.py

@@ -137 +137 @@
     """
     _cache = None # type: Dict[str, np.ndarray]
-    def __init__(self, data, model, cutoff=1e-5, name=None, extra_pars=None):
+    def __init__(self, data, model, cutoff=1e-5, name=None):
         # type: (Data, Model, float) -> None
         # remember inputs so we can inspect from outside
@@ -145 +145 @@
         self._interpret_data(data, model.sasmodel)
         self._cache = {}
-        self.extra_pars = extra_pars
 
     def update(self):
@@ -167 +166 @@
         Return a dictionary of parameters
         """
-        pars = self.model.parameters()
-        if self.extra_pars:
-            pars.update(self.extra_pars)
-        return pars
+        return self.model.parameters()
 
     def theory(self):

sasmodels/kerneldll.py

@@ -158 +158 @@
         return CC + [source, "-o", output, "-lm"]
 
-# Assume the default location of module DLLs is in .sasmodels/compiled_models.
-DLL_PATH = os.path.join(os.path.expanduser("~"), ".sasmodels", "compiled_models")
+# Windows-specific solution
+if os.name == 'nt':
+    # Assume the default location of module DLLs is in .sasmodels/compiled_models.
+    DLL_PATH = os.path.join(os.path.expanduser("~"), ".sasmodels", "compiled_models")
+    if not os.path.exists(DLL_PATH):
+        os.makedirs(DLL_PATH)
+else:
+    # Set up the default path for compiled modules.
+    DLL_PATH = tempfile.gettempdir()
 
 ALLOW_SINGLE_PRECISION_DLLS = True
@@ -226 +233 @@
 
     Set *sasmodels.kerneldll.DLL_PATH* to the compiled dll output path.
-    The default is in ~/.sasmodels/compiled_models.
+    The default is the system temporary directory.
     """
     if dtype == F16:
@@ -243 +250 @@
         need_recompile = dll_time < newest_source
     if need_recompile:
-        # Make sure the DLL path exists
-        if not os.path.exists(DLL_PATH):
-            os.makedirs(DLL_PATH)
         basename = splitext(os.path.basename(dll))[0] + "_"
         system_fd, filename = tempfile.mkstemp(suffix=".c", prefix=basename)