Merge branch 'master' into HLA-1154_WFPC2_SVM_inconsistent_column_name

spacetelescope · Nov 13, 2023 · 8f70eda · 8f70eda
2 parents 679ce1a + 6154040
commit 8f70eda
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 15 deletions.
diff --git a/doc/.rtd-environment.yml b/doc/.rtd-environment.yml
@@ -2,23 +2,25 @@ name: rtd311
 channels:
     - defaults
 dependencies:
-    - python
-    - setuptools
+    - astropy
     - numpy
     - numpydoc
+    - pip
+    - python=3.11
     - scipy
-    - astropy
     - graphviz
     - pip:
-      - -e ..
-      - sphinx
-      - "sphinx_rtd_theme>1.2.0"
-      - sphinx_automodapi
-      - matplotlib
-      - "spherical_geometry>=1.2.22"
+      - astroquery
       - fitsblender
+      - lxml
+      - matplotlib
       - nictools
+      - photutils
       - pyregion
+      - "spherical_geometry>=1.2.22"
+      - sphinx
+      - "sphinx_rtd_theme>1.2.0"
+      - sphinx_automodapi
       - stwcs
       - stsci.tools
       - "stsci.image>=2.3.0"
@@ -27,7 +29,4 @@ dependencies:
       - stsci.stimage
       - "tweakwcs>=0.8.0"
       - stregion
-      - astroquery
-      - photutils
-      - lxml
       - tables
diff --git a/doc/source/reference/util.rst b/doc/source/reference/util.rst
@@ -12,7 +12,6 @@ and interpretation of the ``MDRIZTAB`` reference file.
 .. toctree::
    :maxdepth: 3
 
-   utilfuncs
    wcsutils
    outimage
    mdztab

diff --git a/drizzlepac/haputils/poller_utils.py b/drizzlepac/haputils/poller_utils.py
@@ -116,6 +116,7 @@
 #
 def interpret_obset_input(results: str, log_level):
     """
+    parses the file generated by the pipeline poller, and produces a tree listing of the output products.
 
     Parameters
     -----------
@@ -141,22 +142,32 @@ def interpret_obset_input(results: str, log_level):
     Interpret the database query for a given obset to prepare the returned
     values for use in generating the names of all the expected output products.
 
-    Input will have formated rows of one of the following three options::
+    Input will have formated rows of one of the following three options
 
     1) Full poller file
+
+    .. code-block::
+
         ib4606c5q_flc.fits,11665,B46,06,1.0,F555W,UVIS,/foo/bar/ib4606c5q_flc.fits
 
     2) Simpler poller file (list); other info taken from file header keywords
+
+    .. code-block::
+    
         ib4606c5q_flc.fits
 
     3) For updating the WFPC2 SVM aperture keyword using the poller file; it
         is important that there are no spaces within the poller aperture keyword(s)
 
+    .. code-block::
+    
         ib4606c5q_flc.fits, PC1-FIX;F160BN15
 
     Full poller files contain filename, proposal_id, program_id, obset_id, exptime, filters, detector, pathname.
 
-    The output dict will have format (as needed by further code for creating the product filenames) of::
+    The output dict will have format (as needed by further code for creating the product filenames) of
+
+    .. code-block::
 
         obs_info_dict["single exposure product 00": {"info": '11665 06 wfc3 uvis empty_aperture ib4606c5q f555w drc',
                                                      "files": ['ib4606c5q_flc.fits']}