Commit 1a9aab08 authored by Heller, William T.'s avatar Heller, William T.
Browse files

Replace sas_temper_engine.py

parent db478f7d

sas_temper/sas_temper_engine.py

+4 −4
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ def define_model(schedule, modconf, temperature, rval, current): 
    

    if schedule is 1:

        for i, p in enumerate(modconf.params):

            if p.kind=="integer":

            if p.kind in ["integer"]:

                local.params[i].val = int(frand(p.min,p.max+1.0))

            else:

                local.params[i].val = frand(p.min,p.max)
@@ -166,7 +166,7 @@ def define_model(schedule, modconf, temperature, rval, current): 
            

        if local.sq is not None:

            for i, sqp in enumerate(modconf.sq.params):

                if sqp.kind=="integer":

                if sqp.kind in ["integer"]:

                    local.sq.params[i].val = int(frand(sqp.min,sqp.max+1.0))

                else:

                    local.sq.params[i].val = frand(sqp.min,sqp.max)
@@ -188,7 +188,7 @@ def define_model(schedule, modconf, temperature, rval, current): 
            if p.polydispersity is not None:

                move = frand(-0.1*rval*p.polydispersity.val,0.1*rval*p.polydispersity.val)

                #catch the integer types

                if p.kind=="integer":

                if p.kind in ["integer"]:

                    local.params[i].polydispersity.val = int(p.polydispersity.val + move)

                else:

                    local.params[i].polydispersity.val = p.polydispersity.val + move
@@ -210,7 +210,7 @@ def define_model(schedule, modconf, temperature, rval, current): 
                    

                if sqp.polydispersity is not None:

                    move = frand(-0.1*rval*sqp.polydispersity.val,0.1*rval*sqp.polydispersity.val)

                    if sqp.kind=="integer":

                    if sqp.kind in ["integer"]:

                        local.sq.params[i].polydispersity.val = int(sqp.polydispersity.val + move)

                    else:

                        local.sq.params[i].polydispersity.val = sqp.polydispersity.val + move