update file paths to new mount

spacetelescope · Dec 16, 2024 · 9523b59 · 9523b59
1 parent 45f2ceb
commit 9523b59
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/dev_utils/compute_psf_library.py b/dev_utils/compute_psf_library.py
@@ -15,7 +15,7 @@
 assert exists(os.environ['PYSYN_CDBS']), "Can't load synthetic photometry files!"
 
 if not os.environ.get('STPSF_PATH'):
-    os.environ['STPSF_PATH'] = '/grp/jwst/ote/stpsf-data'   # TODO SAPP  change to stpsf when new mount is ready
+    os.environ['STPSF_PATH'] = '/grp/stpsf/stpsf-data'
 import stpsf  # noqa
 
 N_PROCESSES = 16

diff --git a/dev_utils/grab_opd_info.py b/dev_utils/grab_opd_info.py
@@ -7,8 +7,7 @@
 from scipy import ndimage
 import stpsf
 
-# TODO SAPP  - this should transition to stpsf location after new mount
-matfile = '/grp/jwst/ote/stpsf-data-source/OTE_source/JWST_thermal_response_data05_31_2017.mat'
+matfile = '/grp/stpsf/stpsf-data-source/OTE_source/JWST_thermal_response_data05_31_2017.mat'
 
 
 def load_matfile(matfile):

diff --git a/dev_utils/make-data-sdist.sh b/dev_utils/make-data-sdist.sh
@@ -7,9 +7,8 @@ if ! [[ $1 ]]; then
   echo "    ./make-data-sdist.sh 0.3.3"
   exit 1
 fi
-# TODO SAPP  move this to proper location stpsf after new mount
 if ! [[ $DATAROOT ]]; then
-  DATAROOT="/grp/jwst/ote/stpsf-data-source/"
+  DATAROOT="/grp/stpsf/stpsf-data-source/"
 fi
 echo "Using data from $DATAROOT"
 

diff --git a/dev_utils/master_data_release.sh b/dev_utils/master_data_release.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # Top-level script to make a distributable version of the data files
 
-# See /grp/stpsf/stpsf-data-source/README_DEVEL.txt  # TODO SAPP  VERIFY THIS IS CREATED
+# See /grp/stpsf/stpsf-data-source/README_DEVEL.txt
 
 if ! [[ $1 ]]; then
   echo "Provide a version string, e.g.:"
@@ -15,10 +15,10 @@ TMPDIR="/tmp/stpsf-data"
 ./make-data-sdist.sh $VER
 
 echo
-echo "Copying latest data to /grp/jwst/ote for internal stsci use..."
-main_directory="/grp/jwst/ote"  # TODO SAPP  - update when stpsf new data mount
+echo "Copying latest data to /grp/stpsf for internal stsci use..."
+main_directory="/grp/stpsf"
 new_directory="$main_directory/stpsf-data-$VER"
-symlink_directory="/grp/jwst/ote/stpsf-data"
+symlink_directory="/grp/stpsf/stpsf-data"
 legacy_webbpsf_symlink_directory="/grp/jwst/ote/webbpsf-data"
 
 cp "$PWD/stpsf-data-$VER.tar.gz" "$main_directory"

diff --git a/docs/installation.rst b/docs/installation.rst
@@ -87,7 +87,7 @@ You should now be able to successfully ``import stpsf`` in a Python session.
 .. Note::
 
    **For STScI Users Only:** Users at STScI may access the required data files from the Central Storage network. Set the following environment variables in your ``bash`` shell. (You will probably want to add this to your ``.bashrc``.) ::
-      export STPSF_PATH="/grp/jwst/ote/stpsf-data"
+      export STPSF_PATH="/grp/stpsf/stpsf-data"
       export PYSYN_CDBS="/grp/hst/cdbs"
 
 Software Requirements

diff --git a/stpsf/stpsf_core.py b/stpsf/stpsf_core.py
@@ -1638,7 +1638,7 @@ def load_wss_opd(self, filename, output_path=None, backout_si_wfe=True, verbose=
 
         output_path : str
             Downloaded OPD are saved in this location.
-            This option is convinient for STScI users using /grp/jwst/ote/stpsf-data/.
+            This option is convinient for STScI users using /grp/stpsf/stpsf-data/.
             Default is $STPSF_PATH/MAST_JWST_WSS_OPDs
 
         backout_si_wfe : bool