Changes in / [9538fae:886a89d] in sasmodels

Location:

example

Files:

• sesansfit.py (modified) (3 diffs)
• sesansfit.sh (modified) (1 diff)

example/sesansfit.py

@@ -1 +1 @@
 from bumps.names import *
 from sasmodels import core, bumps_model, sesans
-from sas.sascalc.dataloader.loader import Loader
 
 HAS_CONVERTER = True
@@ -27 +26 @@
     """
     try:
+        from sas.sascalc.dataloader.loader import Loader
         loader = Loader()
         data = loader.load(file)
         if data is None: raise IOError("Could not load file %r"%(file))
+        data.needs_all_q = acceptance_angle is not None
         if HAS_CONVERTER == True:
             default_unit = "A"
@@ -57 +58 @@
             dy = err_data
             sample = Sample()
+            acceptance_angle = acceptance_angle
             needs_all_q = acceptance_angle is not None
         data = SESANSData1D()
-        data.acceptance_angle = acceptance_angle
 
-    data.needs_all_q = acceptance_angle is not None
     if "radius" in initial_vals:
         radius = initial_vals.get("radius")

example/sesansfit.sh

@@ -1 +1 @@
 #!/bin/bash
 
-# Need to fix the paths to sasmodels and sasview if no eggs present
-echo $PWD
-ONEUP="$(dirname "$PWD")"
-PROJECTS="$(dirname "$ONEUP")"
-CCOLON="C:/"
-CSLASH="/c/"
-SASMODELSBASE=$PROJECTS/sasmodels/
-SASMODELS="${SASMODELSBASE/$CSLASH/$CCOLON}"
-SASVIEWBASE=$PROJECTS/sasview/src/
-SASVIEW="${SASVIEWBASE/$CSLASH/$CCOLON}"
-PYTHONPATH="$SASVIEW;$SASMODELS"
+SASVIEW=$PWD/../../sasview/src
+PYTHONPATH=$PWD/../:$PWD/../../bumps:$PWD/../../periodictable:$SASVIEW
 export PYOPENCL_CTX PYTHONPATH