Loading tests/test_coupled_params.py +64 −52 Original line number Diff line number Diff line Loading @@ -10,7 +10,7 @@ Oak Ridge National Laboratory, 2020 """ import sys import sas_temper.sa_config as sa_config import sas_temper.sas_temper_config as sa_config import sas_temper.parse_conf as parse_conf import sas_temper.modelconfig as modelconfig import sas_temper.param as param Loading Loading @@ -45,7 +45,7 @@ def main(): if p.kind in ["fixed"]: print("\t\t\t value: " + str(p.min)) else : (print "\t\t\t range: " + str(p.min) + " to " + str(p.max)) print("\t\t\t range: " + str(p.min) + " to " + str(p.max)) if p.coupled is not None : print("\t\t\t coupled to " + str(p.coupled)) Loading @@ -66,12 +66,24 @@ def main(): cur = modelconfig.ModelConfig(modelConf.name,modelConf.category,modelConf.params,modelConf.sq) # then call the function that will create a single random model f = engine.define_model(1,modconf,10.0,1.0,cur) f = engine.define_model(1,modelConf,10.0,1.0,cur) # convert it to a configuration that is used for calculating an actual model profile conv_conf = modelconfig.convert_conf(f) # print out the results print("") print("Original Configuration") for i,p in enumerate(f.params): print("\t\tparameters name: " + str(p.name) + " value: " + str(p.val)) if f.sq is not None: print("\tstructure factor: " + f.sq.type) for i,sqp in enumerate(f.sq.params): print("\t\tparameters name: " + str(sqp.name) + " value: " + str(sqp.val)) print("") print("Converted Configuration") for i,p in enumerate(conv_conf.params): print("\t\tparameters name: " + str(p.name) + " value: " + str(p.val)) Loading Loading
tests/test_coupled_params.py +64 −52 Original line number Diff line number Diff line Loading @@ -10,7 +10,7 @@ Oak Ridge National Laboratory, 2020 """ import sys import sas_temper.sa_config as sa_config import sas_temper.sas_temper_config as sa_config import sas_temper.parse_conf as parse_conf import sas_temper.modelconfig as modelconfig import sas_temper.param as param Loading Loading @@ -45,7 +45,7 @@ def main(): if p.kind in ["fixed"]: print("\t\t\t value: " + str(p.min)) else : (print "\t\t\t range: " + str(p.min) + " to " + str(p.max)) print("\t\t\t range: " + str(p.min) + " to " + str(p.max)) if p.coupled is not None : print("\t\t\t coupled to " + str(p.coupled)) Loading @@ -66,12 +66,24 @@ def main(): cur = modelconfig.ModelConfig(modelConf.name,modelConf.category,modelConf.params,modelConf.sq) # then call the function that will create a single random model f = engine.define_model(1,modconf,10.0,1.0,cur) f = engine.define_model(1,modelConf,10.0,1.0,cur) # convert it to a configuration that is used for calculating an actual model profile conv_conf = modelconfig.convert_conf(f) # print out the results print("") print("Original Configuration") for i,p in enumerate(f.params): print("\t\tparameters name: " + str(p.name) + " value: " + str(p.val)) if f.sq is not None: print("\tstructure factor: " + f.sq.type) for i,sqp in enumerate(f.sq.params): print("\t\tparameters name: " + str(sqp.name) + " value: " + str(sqp.val)) print("") print("Converted Configuration") for i,p in enumerate(conv_conf.params): print("\t\tparameters name: " + str(p.name) + " value: " + str(p.val)) Loading