Changeset 4a72d1a in sasmodels

Timestamp:

Mar 21, 2016 4:18:16 AM (9 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:

e1bdc7e, 3a45c2c

Parents:

303d8d6

Message:

fill out the mono details table in new calculator

Location:

sasmodels

Files:

• generate.py (modified) (1 diff)
• kerneldll.py (modified) (2 diffs)

sasmodels/generate.py

@@ -651 +651 @@
 
 def mono_details(max_pd, npars):
-    par_offset = 5*max_pd
-    const_offset = par_offset + 3*npars
-
-    mono = np.zeros(const_offset + 3, 'i')
-    mono[0] = 0                # pd_par: arbitrary order; use first
-    mono[1*max_pd] = 1         # pd_length: only one element
-    mono[2*max_pd] = 2         # pd_offset: skip scale and background
-    mono[3*max_pd] = 1         # pd_stride: vectors of length 1
-    mono[4*max_pd-1] = 1       # pd_stride[-1]: only one element in set
-    mono[4*max_pd] = 0         # pd_isvol: doens't matter if no norm
-    mono[par_offset:par_offset+npars] = np.arange(2, npars+2, dtype='i')
-    # par_offset: copied in order
-    mono[par_offset+npars:par_offset+2*npars] = 0
-    # par_coord: no coordinated parameters
-    mono[par_offset+npars] = 1 # par_coord[0]: except par 0
-    mono[par_offset+2*npars:par_offset+3*npars] = 0
-    # fast coord with 0
-    mono[const_offset] = 1     # fast_coord_count: one fast index
-    mono[const_offset+1] = -1  # theta_var: None
-    mono[const_offset+2] = 0   # fast_theta: False
+    p = 5*max_pd
+    c = p + 3*npars
+
+    mono = np.zeros(c + 3, 'i')
+    mono[0*max_pd:1*max_pd] = range(max_pd)       # pd_par: arbitrary order; use first
+    mono[1*max_pd:2*max_pd] = [1]*max_pd          # pd_length: only one element
+    mono[2*max_pd:3*max_pd] = range(2, max_pd+2)  # pd_offset: skip scale and background
+    mono[3*max_pd:4*max_pd] = [1]*max_pd          # pd_stride: vectors of length 1
+    mono[4*max_pd:5*max_pd] = [0]*max_pd          # pd_isvol: doens't matter if no norm
+    mono[p+0*npars:p+1*npars] = range(2, npars+2) # par_offset
+    mono[p+1*npars:p+2*npars] = [0]*npars         # no coordination
+    #mono[p+npars] = 1 # par_coord[0] is coordinated with the first par?
+    mono[p+2*npars:p+3*npars] = 0 # fast coord with 0
+    mono[c]   = 1     # fast_coord_count: one fast index
+    mono[c+1] = -1  # theta_var: None
+    mono[c+2] = 0   # fast_theta: False
     return mono
 

sasmodels/kerneldll.py

@@ -61 +61 @@
 if sys.platform == 'darwin':
     #COMPILE = "gcc-mp-4.7 -shared -fPIC -std=c99 -fopenmp -O2 -Wall %s -o %s -lm -lgomp"
-    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm -fno-unknown-pragmas"
+    COMPILE = "gcc -shared -fPIC -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"
 elif os.name == 'nt':
     # call vcvarsall.bat before compiling to set path, headers, libs, etc.
@@ -81 +81 @@
         if "SAS_OPENMP" in os.environ:
             COMPILE += " -fopenmp"
-        else:
-            COMPILE += " -fWno-unknown-pragmas"
 else:
     COMPILE = "cc -shared -fPIC -fopenmp -std=c99 -O2 -Wall %(source)s -o %(output)s -lm"