restore script to default and update MacOSX py36 environment file

gnarayan · Mar 24, 2018 · 348a043 · 348a043
1 parent a8486b5
commit 348a043
Show file tree

Hide file tree

Showing 2 changed files with 176 additions and 48 deletions.
diff --git a/data/photometry/20171019/ACAS/AS/calc_zptmag_apparent_mags_hierarchical_ILAPHv3.py b/data/photometry/20171019/ACAS/AS/calc_zptmag_apparent_mags_hierarchical_ILAPHv3.py
@@ -15,13 +15,13 @@
 from collections import OrderedDict
 
 def main():
-    suffix = '_noG191'
+    suffix = ''
     ref = 'FMAG'  # which photometry package should be used to compute zeropoints
     mintime = 0.7 # mininum exposure length to consider for computing zeropoints
 
     stars     = ['GD-153', 'GD-71', 'G191B2B'] # what stars are standards
     marker    = ['o',      'd',     '*']       # markers to use for each standard in plots
-    use_stars = ['GD-153', 'GD-71'] # what stars are to be used to get zeropoints
+    use_stars = ['GD-153', 'GD-71', 'G191B2B'] # what stars are to be used to get zeropoints
 
     standard_mags_file = '../calspec_standards_WFC3_UVIS2_IR_vegamag.txt' # standard's apparent magnitudes in each band
     smags = at.Table.read(standard_mags_file, format='ascii')

diff --git a/docs/env/conda_environment_py36_osx64.yml b/docs/env/conda_environment_py36_osx64.yml
@@ -1,50 +1,178 @@
 name: WDmodel
 channels:
-- mpi4py
-- defaults
-- http://ssb.stsci.edu/astroconda
-- conda-forge
+  - mpi4py
+  - defaults
+  - http://ssb.stsci.edu/astroconda
+  - conda-forge
 dependencies:
-- args=0.1.0=py36_0
-- celerite=0.2.0=np112py36_0
-- clint=0.5.1=py36_0
-- corner=2.0.1=py36_0
-- emcee=2.2.1=py36_3
-- extinction=0.3.0=np112py36_0
-- uncertainties=3.0.1=py36_0
-- astropy=1.3.3=np112py36_0
-- coverage=4.4.1=py36_0
-- cycler=0.10.0=py36_0
-- freetype=2.5.5=2
-- h5py=2.7.0=np112py36_0
-- hdf5=1.8.17=1
-- icu=54.1=0
-- libpng=1.6.27=0
-- matplotlib=2.0.2=np112py36_0
-- mkl=2017.0.3=0
-- numpy=1.12.1=py36_0
-- openssl=1.0.2l=0
-- pip=9.0.1=py36_1
-- pyparsing=2.1.4=py36_0
-- pyqt=5.6.0=py36_2
-- python=3.6.1=2
-- python-dateutil=2.6.0=py36_0
-- pytz=2017.2=py36_0
-- qt=5.6.2=2
-- readline=6.2=2
-- scipy=0.19.1=np112py36_0
-- setuptools=27.2.0=py36_0
-- sip=4.18=py36_0
-- six=1.10.0=py36_0
-- sqlite=3.13.0=0
-- tk=8.5.18=0
-- wheel=0.29.0=py36_0
-- xz=5.2.2=1
-- zlib=1.2.8=3
-- pysynphot=0.9.8.6=py36_0
-- mpich=3.2.0=0
-- pip:
-  - iminuit==1.2
-  - mpi4py==2.0.0
-prefix: /Users/gnarayan/anaconda2/envs/WDmodel
+  - args=0.1.0=py36_0
+  - celerite=0.3.0=py36_0
+  - clint=0.5.1=py36_0
+  - corner=2.0.1=py36_0
+  - emcee=2.2.1=py36_3
+  - extinction=0.3.0=np113py36_0
+  - george=0.3.1=py36_0
+  - uncertainties=3.0.2=py36_1
+  - _nb_ext_conf=0.4.0=py36_1
+  - alabaster=0.7.10=py36h174008c_0
+  - anaconda-client=1.6.14=py36_0
+  - appnope=0.1.0=py36hf537a9a_0
+  - asn1crypto=0.24.0=py36_0
+  - astropy=3.0.1=py36h1de35cc_1
+  - attrs=17.4.0=py36_0
+  - babel=2.5.3=py36_0
+  - bleach=2.1.3=py36_0
+  - ca-certificates=2017.08.26=ha1e5d58_0
+  - cctools=895=h7512d6f_0
+  - certifi=2018.1.18=py36_0
+  - cffi=1.11.5=py36h342bebf_0
+  - chardet=3.0.4=py36h96c241c_1
+  - clang=4.0.1=h662ec87_0
+  - clang_osx-64=4.0.1=h1ce6c1d_10
+  - clangxx=4.0.1=hc9b4283_0
+  - clangxx_osx-64=4.0.1=h22b1bf0_10
+  - clyent=1.2.2=py36hae3ad88_0
+  - compiler-rt=4.0.1=h5487866_0
+  - coverage=4.5.1=py36h1de35cc_0
+  - cryptography=2.2.1=py36h1de35cc_0
+  - cycler=0.10.0=py36hfc81398_0
+  - dbus=1.12.2=h5243cc1_1
+  - decorator=4.2.1=py36_0
+  - docutils=0.14=py36hbfde631_0
+  - entrypoints=0.2.3=py36hd81d71f_2
+  - expat=2.2.5=hb8e80ba_0
+  - freetype=2.8=h12048fb_1
+  - gettext=0.19.8.1=h15daf44_3
+  - glib=2.53.6=h33f6a65_2
+  - h5py=2.7.1=py36h39cdac5_0
+  - hdf5=1.10.1=ha036c08_1
+  - html5lib=1.0.1=py36h2f9c1c0_0
+  - hypothesis=3.46.0=py36_1
+  - icu=58.2=h4b95b61_1
+  - idna=2.6=py36h8628d0a_1
+  - imagesize=1.0.0=py36_0
+  - intel-openmp=2018.0.0=8
+  - ipykernel=4.8.2=py36_0
+  - ipython=6.2.1=py36h3dda519_1
+  - ipython_genutils=0.2.0=py36h241746c_0
+  - ipywidgets=7.1.2=py36_0
+  - jedi=0.11.1=py36_1
+  - jinja2=2.10=py36hd36f9c5_0
+  - joblib=0.11=py36_0
+  - jpeg=9b=he5867d9_2
+  - jsonschema=2.6.0=py36hb385e00_0
+  - jupyter=1.0.0=py36_4
+  - jupyter_client=5.2.3=py36_0
+  - jupyter_console=5.2.0=py36hccf5b1c_1
+  - jupyter_core=4.4.0=py36h79cf704_0
+  - kiwisolver=1.0.1=py36h792292d_0
+  - ld64=274.2=h7c2db76_0
+  - libcxx=4.0.1=h579ed51_0
+  - libcxxabi=4.0.1=hebd6815_0
+  - libedit=3.1=hb4e282d_0
+  - libffi=3.2.1=h475c297_4
+  - libgfortran=3.0.1=h93005f0_2
+  - libgpuarray=0.7.5=h1de35cc_0
+  - libiconv=1.15=hdd342a3_7
+  - libpng=1.6.34=he12f830_0
+  - libsodium=1.0.15=hd9e47c5_0
+  - llvm=4.0.1=hc748206_0
+  - llvm-lto-tapi=4.0.1=h6701bc3_0
+  - mako=1.0.7=py36h55379d4_0
+  - markupsafe=1.0=py36h3a1e703_1
+  - matplotlib=2.2.2=py36ha7267d0_0
+  - mistune=0.8.3=py36_0
+  - mkl=2018.0.2=1
+  - mkl-service=1.1.2=py36h7ea6df4_4
+  - nb_anacondacloud=1.4.0=py36_0
+  - nb_conda=2.2.1=py36h349edbb_0
+  - nb_conda_kernels=2.1.0=py36_0
+  - nbconvert=5.3.1=py36h810822e_0
+  - nbformat=4.4.0=py36h827af21_0
+  - nbpresent=3.0.2=py36hef4c988_1
+  - ncurses=6.0=hd04f020_2
+  - nose=1.3.7=py36h73fae2b_2
+  - notebook=5.4.1=py36_0
+  - numpy=1.13.3=py36ha726252_3
+  - numpydoc=0.7.0=py36he54d08e_0
+  - openssl=1.0.2n=hdbc3d79_0
+  - packaging=17.1=py36_0
+  - pandas=0.22.0=py36h0a44026_0
+  - pandoc=1.19.2.1=ha5e8f32_1
+  - pandocfilters=1.4.2=py36h3b0b094_1
+  - parso=0.1.1=py36hc90e01c_0
+  - path.py=11.0=py36_0
+  - patsy=0.5.0=py36_0
+  - pcre=8.41=hfb6ab37_1
+  - pexpect=4.4.0=py36_0
+  - pickleshare=0.7.4=py36hf512f8e_0
+  - pip=9.0.1=py36_5
+  - pluggy=0.6.0=py36hb1d0581_0
+  - prompt_toolkit=1.0.15=py36haeda067_0
+  - psutil=5.4.3=py36h1de35cc_0
+  - ptyprocess=0.5.2=py36he6521c3_0
+  - py=1.5.2=py36ha69170d_0
+  - pycparser=2.18=py36h724b2fc_1
+  - pygments=2.2.0=py36h240cd3f_0
+  - pygpu=0.7.5=py36h1de35cc_0
+  - pymc3=3.3=py36_0
+  - pympler=0.5=py36hc2752d1_0
+  - pyopenssl=17.5.0=py36h51e4350_0
+  - pyparsing=2.2.0=py36hb281f35_0
+  - pyqt=5.6.0=py36he5c6137_6
+  - pysocks=1.6.8=py36_0
+  - pytest=3.4.2=py36_0
+  - pytest-arraydiff=0.2=py36_0
+  - pytest-astropy=0.2.1=py36_0
+  - pytest-doctestplus=0.1.2=py36_0
+  - pytest-openfiles=0.2.0=py36_0
+  - pytest-remotedata=0.2.0=py36_0
+  - python=3.6.4=hc167b69_3
+  - python-dateutil=2.7.0=py36_0
+  - pytz=2018.3=py36_0
+  - pyyaml=3.12=py36h2ba1e63_1
+  - pyzmq=17.0.0=py36h1de35cc_0
+  - qt=5.6.2=h9975529_14
+  - qtconsole=4.3.1=py36hd96c0ff_0
+  - readline=7.0=hc1231fa_4
+  - requests=2.18.4=py36h4516966_1
+  - scipy=1.0.0=py36h1de22e9_0
+  - seaborn=0.8.1=py36h595ecd9_0
+  - send2trash=1.5.0=py36_0
+  - setuptools=38.5.1=py36_0
+  - simplegeneric=0.8.1=py36_2
+  - sip=4.18.1=py36h2824476_2
+  - six=1.11.0=py36h0e22d5e_1
+  - snowballstemmer=1.2.1=py36h6c7b616_0
+  - sphinx=1.7.1=py36_0
+  - sphinxcontrib=1.0=py36h9364dc8_1
+  - sphinxcontrib-websupport=1.0.1=py36h92f4a7a_1
+  - sqlite=3.22.0=h3efe00b_0
+  - statsmodels=0.8.0=py36h9c68fc9_0
+  - terminado=0.8.1=py36_1
+  - testpath=0.3.1=py36h625a49b_0
+  - theano=1.0.1=py36h04f5b5a_0
+  - tk=8.6.7=h35a86e2_3
+  - tornado=5.0=py36_0
+  - tqdm=4.19.5=py36_0
+  - traitlets=4.3.2=py36h65bd3ce_0
+  - typing=3.6.4=py36_0
+  - urllib3=1.22=py36h68b9469_0
+  - wcwidth=0.1.7=py36h8c6ec74_0
+  - webencodings=0.5.1=py36h3b9701d_1
+  - wheel=0.30.0=py36h5eb2c71_1
+  - widgetsnbextension=3.1.4=py36_0
+  - xz=5.2.3=h0278029_2
+  - yaml=0.1.7=hc338f04_2
+  - zeromq=4.2.3=h378b8a2_3
+  - zlib=1.2.11=hf3cbc9b_2
+  - zope=1.0=py36_0
+  - zope.interface=4.4.3=py36h74e83c9_0
+  - pysynphot=0.9.9=py36_0
+  - mpich=3.2.0=0
+  - pip:
+    - iminuit==1.2
+    - mpi4py==2.0.0
+    - pybind11==2.1.1
+prefix: /Users/gnarayan/anaconda3/envs/WDmodel