Changeset c210c94 in sasmodels

Timestamp:

Mar 24, 2015 7:37:53 AM (10 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6871c9e

Parents:

0656250

Message:

fix sesansfit merge

File:

• example/sesansfit.py (modified) (1 diff)

example/sesansfit.py

@@ -12 +12 @@
     from sas.dataloader.loader import Loader
     loader=Loader()
-<<<<<<< HEAD
-    data=loader.load('se008724_01.ses')
-#    data=loader.load('testsasview1.ses')
- 
-=======
     filename = 'testsasview1.ses'
     data=loader.load(filename)
     if data is None: raise IOError("Could not load file %r"%(filename,))
-    print dir(data), type(data)
->>>>>>> 0a33675f5dfe63dcfc7345913a0bb44858641acc
     data.x /=10
 #    print data