Changes in sasmodels/generate.py [b297ba9:a34b811] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/generate.py
rb297ba9 ra34b811 27 27 which are hollow. 28 28 29 * effective_radius(mode, p1, p2, ...)* returns the effective radius of29 *radius_effective(mode, p1, p2, ...)* returns the effective radius of 30 30 the form with particular dimensions. Mode determines the type of 31 31 effective radius returned, with mode=1 for equivalent volume. … … 820 820 for p in partable.kernel_parameters)) 821 821 # Define the function calls 822 call_ effective_radius = "#define CALL_EFFECTIVE_RADIUS(_mode, _v) 0.0"822 call_radius_effective = "#define CALL_RADIUS_EFFECTIVE(_mode, _v) 0.0" 823 823 if partable.form_volume_parameters: 824 824 refs = _call_pars("_v.", partable.form_volume_parameters) … … 833 833 "do { _form = _shell = form_volume(%s); } " 834 834 "while (0)") % (",".join(refs)) 835 if model_info. effective_radius_type:836 call_ effective_radius= (837 "#define CALL_ EFFECTIVE_RADIUS(_mode, _v) "838 " effective_radius(_mode, %s)") % (",".join(refs))835 if model_info.radius_effective_modes: 836 call_radius_effective = ( 837 "#define CALL_RADIUS_EFFECTIVE(_mode, _v) " 838 "radius_effective(_mode, %s)") % (",".join(refs)) 839 839 else: 840 840 # Model doesn't have volume. We could make the kernel run a little … … 845 845 "do { _form = _shell = 1.0; } while (0)") 846 846 source.append(call_volume) 847 source.append(call_ effective_radius)847 source.append(call_radius_effective) 848 848 model_refs = _call_pars("_v.", partable.iq_parameters) 849 849
Note: See TracChangeset
for help on using the changeset viewer.