Commit 43ec1370 authored by Heller, William T.'s avatar Heller, William T.
Browse files

Merge branch 'more_axes' into 'master'

More axes

See merge request !22
parents 284bb3d0 a191dbb6
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
**sas_temper**
**sas-temper**

SAS data analysis package that uses simulated annealing to fit data using the sasmodels package.
The program automatically performs multiple runs of the fitting to check the reproducibility of the result.
@@ -15,7 +15,7 @@ you can create a specific environment using conda and the sas_temper_env.yaml fi
conda env create -f sas_temper_env.yaml
```

To activate the environment so you can run sas_temper, type the following.
To activate the environment so you can run sas-temper, type the following.

```
conda activate sas_temper
@@ -33,9 +33,10 @@ An example is available in the `examples` directory:

```
cd examples
sas_temper test_sphere_nz.yaml
sas-temper test_sphere_nz.yaml
```

**Note the use of the dash in the executable script name, rather than an underscore.**

A portion of this research was sponsored by the Laboratory Directed Research 
and Development Program of Oak Ridge National Laboratory, managed by UT-Battelle, 
+3 −3
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ def outputSetRes(conf, res):
                    grph.set_xlabel(str(names[i]))
                    grph.set_ylabel(str(names[j]))
                    oname = str(conf.output)+"_"+str(names[j])+"_"+str(names[i])+".png"
                    fig.savefig(oname,format="png")
                    fig.savefig(oname,format="png", bbox_inches = "tight")
                    plt.close(fig)

    # output histograms of the non-fixed parameters
@@ -268,7 +268,7 @@ def outputSetRes(conf, res):
            grph.plot(vals[i],chisq,'ko')

            oname = str(conf.output)+"_"+str(names[i])+"_chisq.png"
            fig.savefig(oname,format="png")
            fig.savefig(oname,format="png", bbox_inches = "tight")
            plt.close(fig)


@@ -292,5 +292,5 @@ def outputFitCurve(conf, d, m, mnum, chisq):
    ax.plot(m.x,m.y,color='r',linewidth=2, zorder=2.5)

    oname = str(conf.output)+"%02d.png" %(mnum)
    fig.savefig(oname,format='png')
    fig.savefig(oname,format='png', bbox_inches = "tight")
    plt.close(fig)
+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ dependencies:
- python=3.6
- pip:
  - scipy
  - numpy
  - matplotlib
  - sasmodels
  - pyyaml
Loading