Merge pull request #169 from spacetelescope/revert-167-master

Revert "STIPS 2.1 Pull Request"

.gitignore

@@ -24,7 +24,6 @@ MANIFEST
 # Sphinx
 docs/api
 docs/_build
-docs/_static
 
 # Eclipse editor project files
 .project
@@ -155,7 +154,6 @@ nosetests.xml
 coverage.xml
 *.cover
 .hypothesis/
-ref_data/
 
 # Translations #
 ################

CHANGES.rst

@@ -5,13 +5,6 @@ Release Notes
 Version History and Change Log
 ------------------------------
 
-Version 2.1.0
-=============
-- Updated the Flux PHOTFNU values to match Pandeia
-- Updated the background and noise estimates to use Pandeia
-- Updated webbpsf to version 1.1
-- Updated pandeia to version 2.0
-
 Version 2.0.0
 =============
 

docs/basic_tutorial.rst

@@ -55,7 +55,7 @@ population parameters.  In this example, we will create the following:
 
 #. A stellar population representing a global cluster with:
 
-   * 100 stars
+   * 10000 stars
    * An age of 7.5 billion years
    * A metallicity of -2.0
    * A Salpeter IMF with alpha = -2.35
@@ -81,16 +81,12 @@ population parameters.  In this example, we will create the following:
 
 .. code-block:: python
 
-  obs_prefix = 'notebook_example'
-  obs_ra = 150.0
-  obs_dec = -2.5
-
   from stips.scene_module import SceneModule
 
   scm = SceneModule(out_prefix=obs_prefix, ra=obs_ra, dec=obs_dec)
 
   stellar_parameters = {
-                        'n_stars': 100,
+                        'n_stars': 10000,
                         'age_low': 7.5e12,
                         'age_high': 7.5e12,
                         'z_low': -2.0,
@@ -102,12 +98,12 @@ population parameters.  In this example, we will create the following:
                         'distribution': 'invpow',
                         'radius': 100.0,
                         'radius_units': 'pc',
-                        'distance_low': 20.0,
-                        'distance_high': 20.0,
+                        'distance_low': 10.0,
+                        'distance_high': 10.0,
                         'offset_ra': 0.0,
-                        'offset_dec': 0.0
-                       }
-   
+                        'offset_dec':0.0
+                        }
+
   stellar_cat_file = scm.CreatePopulation(stellar_parameters)
   print("Stellar population saved to file {}".format(stellar_cat_file))
 
@@ -117,7 +113,7 @@ population parameters.  In this example, we will create the following:
                        'z_high': 0.2,
                        'rad_low': 0.01,
                        'rad_high': 2.0,
-                       'sb_v_low': 30.0,
+                       'sb_v_low': 28.0,
                        'sb_v_high': 25.0,
                        'distribution': 'uniform',
                        'clustered': False,
@@ -126,9 +122,10 @@ population parameters.  In this example, we will create the following:
                        'offset_ra': 0.0,
                        'offset_dec': 0.0,
                       }
-   
+
   galaxy_cat_file = scm.CreateGalaxies(galaxy_parameters)
-  print("Galaxy population saved to file {}".format(galaxy_cat_file))
+  print("Galaxy population saved to file{}".format(galaxy_cat_file))
+
 
 Creating a STIPS Observation
 ----------------------------

docs/conf.py

@@ -48,7 +48,7 @@ def setup(app):
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('../'))
-'''
+
 extensions = [
     'sphinx.ext.autodoc',
     'sphinx.ext.intersphinx',
@@ -59,15 +59,6 @@ def setup(app):
     'sphinx_automodapi.automodapi',
     'autoapi.extension',
     ]
-'''
-extensions = [
-    'sphinx.ext.intersphinx',
-    'sphinx.ext.autodoc',
-    'sphinx.ext.autosummary',
-    'sphinx.ext.mathjax',
-    'sphinx.ext.viewcode',
-    'sphinx_rtd_theme',
-]
 
 numpydoc_show_class_members = False
 
@@ -101,7 +92,6 @@ def setup(app):
 
 # The name of the Pygments (syntax highlighting) style to use.
 pygments_style = 'sphinx'
-#pygments_style = 'default'
 
 # -- Options for HTML output --------------------------------------------------
 

docs/installation.rst

@@ -9,9 +9,9 @@ in this section along with instructions.
 STIPS Requirements
 ##################
 
-  \• ``pandeia>=3.0``: Exposure time calculator.
+  \• ``pandeia>=1.7``: Exposure time calculator.
 
-  \• ``webbpsf==1.1.1``: Nancy Grace Roman PSF calculator. STIPS also requires that ``poppy``, a
+  \• ``webbpsf>=1.0.0``: Nancy Grace Roman PSF calculator. STIPS also requires that ``poppy``, a
   support package used by WebbPSF, have version ``>=1.0.3``.
 
   \• ``astropy``: STIPS uses Astropy in order to:

environment.yml

@@ -31,15 +31,20 @@ dependencies:
   - esutil # installed from conda because you need the pre-compiled binaries.
 
   - pip:
+    #
     # Special Modules. These are temporary entries and require documentation.
+    #
+    # poppy 1.0.3 fixes a bug with the way poppy was calling factorial with non-integer
+    # values. Currently this is the only way to ensure that webbpsf picks up the correct
+    # poppy version. This peg should be removed as soon as webbpsf has updated to only
+    # use poppy versions that include this fix.
     - poppy==1.0.3
 
     # Core Modules
-    - webbpsf==1.1.1
-    - pandeia.engine==3.0
+    - webbpsf==1.0.0
+    - pandeia.engine==1.7
     - synphot==1.1.1
     - stsynphot==1.1.0
-    - soc_roman_tools
 
     # Major modules
     - astropy

environment_dev.yml

@@ -44,11 +44,10 @@ dependencies:
     - poppy==1.0.3
 
     # Core Modules
-    - webbpsf==1.1.0
-    - pandeia.engine==3.0
+    - webbpsf==1.0.0
+    - pandeia.engine==1.7
     - synphot==1.1.1
     - stsynphot==1.1.0
-    - soc_roman_tools
 
     # Major modules
     - astropy