Commit 053cedc9 authored by Heller, William T.'s avatar Heller, William T.
Browse files

Replace parse_conf.py

parent cb3a8972

sas_temper/parse_conf.py

+8 −8
Original line number Diff line number Diff line
@@ -78,14 +78,14 @@ def parse_config(name): 
            #now, we create a parameter

            if coupled_name is None:

                if pd_name is None:

                    cur_param = param.Param(name=txt1, kind=var_kind, min=min_val, max=max_val, coupled=None, polydispersity=None, pd_min=0.0, pd_max=0.0)

                    cur_param = param.Param(name=txt1, kind=var_kind, minv=min_val, maxv=max_val, coupled=None, polydispersity=None, pd_min=0.0, pd_max=0.0)

                else:

                    cur_param = param.Param(name=txt1, kind=var_kind, min=min_val, max=max_val, coupled=None, polydispersity=txt3, pd_min=pd_minval, pd_max=pd_maxval)

                    cur_param = param.Param(name=txt1, kind=var_kind, minv=min_val, maxv=max_val, coupled=None, polydispersity=txt3, pd_min=pd_minval, pd_max=pd_maxval)

            else:

                if pd_name is None:

                    cur_param = param.Param(name=txt1, kind=var_kind, min=min_val, max=max_val, coupled=coupled_name, polydispersity=None, pd_min=0.0, pd_max=0.0)

                    cur_param = param.Param(name=txt1, kind=var_kind, minv=min_val, maxv=max_val, coupled=coupled_name, polydispersity=None, pd_min=0.0, pd_max=0.0)

                else:

                    cur_param = param.Param(name=txt1, kind=var_kind, min=min_val, max=max_val, coupled=coupled_name, polydispersity=txt3, pd_min=pd_minval, pd_max=pd_maxval)

                    cur_param = param.Param(name=txt1, kind=var_kind, minv=min_val, maxv=max_val, coupled=coupled_name, polydispersity=txt3, pd_min=pd_minval, pd_max=pd_maxval)

            

            #and add it to the array of parameters

            model_params.append(cur_param)
@@ -129,14 +129,14 @@ def parse_config(name): 
                    #now, we create a parameter

                    if sq_coupled_name is None:

                        if sq_pd_name is None:

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, min=sq_min_val, max=sq_max_val, coupled=None, polydispersity=None, pd_min=0.0, pd_max=0.0)

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, minv=sq_min_val, maxv=sq_max_val, coupled=None, polydispersity=None, pd_min=0.0, pd_max=0.0)

                        else:

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, min=sq_min_val, max=sq_max_val, coupled=None, polydispersity=txt3, pd_min=pd_minval, pd_max=pd_maxval)

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, minv=sq_min_val, maxv=sq_max_val, coupled=None, polydispersity=txt3, pd_min=pd_minval, pd_max=pd_maxval)

                    else:

                        if sq_pd_name is None:

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, min=sq_min_val, max=sq_max_val, coupled=sq_coupled_name, polydispersity=None, pd_min=0.0, pd_max=0.0)

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, minv=sq_min_val, maxv=sq_max_val, coupled=sq_coupled_name, polydispersity=None, pd_min=0.0, pd_max=0.0)

                        else:

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, min=sq_min_val, max=sq_max_val, coupled=sq_coupled_name, polydispersity=txt4, pd_min=sq_pd_minval, pd_max=sq_pd_maxval)

                            sq_cur_param = param.Param(name=txt2, kind=sq_var_kind, minv=sq_min_val, maxv=sq_max_val, coupled=sq_coupled_name, polydispersity=txt4, pd_min=sq_pd_minval, pd_max=sq_pd_maxval)

    

                    #and add it to the array of structure factor parameters

                    s_of_q_params.append(sq_cur_param)