Changes in sasmodels/compare.py [fa1582e:d19962c] in sasmodels
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
sasmodels/compare.py
rfa1582e rd19962c 306 306 Format the parameter list for printing. 307 307 """ 308 if is2d:309 exclude = lambda n: False310 else:311 partype = model_info['partype']312 par1d = set(partype['fixed-1d']+partype['pd-1d'])313 exclude = lambda n: n not in par1d314 308 lines = [] 315 for p in model_info['parameters']:316 if exclude(p.name): continue309 parameters = model_info['parameters'] 310 for p in parameters.user_parameters(pars, is2d): 317 311 fields = dict( 318 value=pars.get(p. name, p.default),319 pd=pars.get(p. name+"_pd", 0.),320 n=int(pars.get(p. name+"_pd_n", 0)),321 nsigma=pars.get(p. name+"_pd_nsgima", 3.),322 type=pars.get(p. name+"_pd_type", 'gaussian'))312 value=pars.get(p.id, p.default), 313 pd=pars.get(p.id+"_pd", 0.), 314 n=int(pars.get(p.id+"_pd_n", 0)), 315 nsigma=pars.get(p.id+"_pd_nsgima", 3.), 316 type=pars.get(p.id+"_pd_type", 'gaussian')) 323 317 lines.append(_format_par(p.name, **fields)) 324 318 return "\n".join(lines) … … 454 448 """ 455 449 # initialize the code so time is more accurate 456 value = calculator(**suppress_pd(pars)) 450 if Nevals > 1: 451 value = calculator(**suppress_pd(pars)) 457 452 toc = tic() 458 453 for _ in range(max(Nevals, 1)): # make sure there is at least one eval … … 661 656 """ 662 657 # Get the default values for the parameters 663 pars = dict((p.name, p.default) for p in model_info['parameters']) 664 665 # Fill in default values for the polydispersity parameters 666 for p in model_info['parameters']: 667 if p.type in ('volume', 'orientation'): 668 pars[p.name+'_pd'] = 0.0 669 pars[p.name+'_pd_n'] = 0 670 pars[p.name+'_pd_nsigma'] = 3.0 671 pars[p.name+'_pd_type'] = "gaussian" 658 pars = {} 659 for p in model_info['parameters'].call_parameters: 660 parts = [('', p.default)] 661 if p.polydisperse: 662 parts.append(('_pd', 0.0)) 663 parts.append(('_pd_n', 0)) 664 parts.append(('_pd_nsigma', 3.0)) 665 parts.append(('_pd_type', "gaussian")) 666 for ext, val in parts: 667 if p.length > 1: 668 dict(("%s%d%s"%(p.id,k,ext), val) for k in range(p.length)) 669 else: 670 pars[p.id+ext] = val 672 671 673 672 # Plug in values given in demo … … 774 773 775 774 if len(engines) == 0: 776 engines.extend(['single', ' sasview'])775 engines.extend(['single', 'double']) 777 776 elif len(engines) == 1: 778 if engines[0][0] != ' sasview':779 engines.append(' sasview')777 if engines[0][0] != 'double': 778 engines.append('double') 780 779 else: 781 780 engines.append('single') … … 785 784 n1 = int(args[1]) if len(args) > 1 else 1 786 785 n2 = int(args[2]) if len(args) > 2 else 1 787 use_sasview = any(engine=='sasview' and count>0788 for engine, count in zip(engines, [n1, n2]))789 786 790 787 # Get demo parameters from model definition, or use default parameters … … 814 811 #import pprint; pprint.pprint(model_info) 815 812 constrain_pars(model_info, pars) 816 if use_sasview: 817 constrain_new_to_old(model_info, pars) 813 constrain_new_to_old(model_info, pars) 818 814 if opts['show_pars']: 819 815 print(str(parlist(model_info, pars, opts['is2d']))) … … 880 876 pars, pd_types = bumps_model.create_parameters(model_info, **opts['pars']) 881 877 if not opts['is2d']: 882 active = [base + ext 883 for base in model_info['partype']['pd-1d'] 884 for ext in ['', '_pd', '_pd_n', '_pd_nsigma']] 885 active.extend(model_info['partype']['fixed-1d']) 886 for k in active: 887 v = pars[k] 888 v.range(*parameter_range(k, v.value)) 878 for p in model_info['parameters'].type['1d']: 879 for ext in ['', '_pd', '_pd_n', '_pd_nsigma']: 880 k = p.name+ext 881 v = pars.get(k, None) 882 if v is not None: 883 v.range(*parameter_range(k, v.value)) 889 884 else: 890 885 for k, v in pars.items():
Note: See TracChangeset
for help on using the changeset viewer.