Merge pull request #597 from ExoCTK/contam_updates

Adds proper motion correction and galaxy support to Contamination tool
ExoCTK · Jul 31, 2024 · f4b3d58 · f4b3d58
2 parents 6787738 + 291c0d6
commit f4b3d58
Show file tree

Hide file tree

Showing 13 changed files with 646 additions and 1,791 deletions.
diff --git a/env/environment-3.10.yml b/env/environment-3.10.yml
@@ -35,7 +35,10 @@ dependencies:
     - docutils>=0.16
     - flask_wtf>=1.1.1
     - h5py>=3.9.0
+<<<<<<< HEAD
+=======
     - hotsoss>=0.1.9
+>>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - gunicorn>=21.1.0
     - numpy>=1.25.1
     - platon>=5.4
@@ -47,6 +50,10 @@ dependencies:
     - scipy>=1.11.1
     - sphinx_astropy>=1.9.1
     - svo-filters>=0.4.4
+<<<<<<< HEAD
+    - werkzeug>=3.0.1
+=======
     - werkzeug==2.0.3
+>>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - jwst_gtvt>=1.0.0
     - astroquery>=0.4.6
diff --git a/env/environment-3.11.yml b/env/environment-3.11.yml
@@ -32,10 +32,16 @@ dependencies:
     - bibtexparser>=1.4.0
     - boto3>=1.28.5
     - corner>=2.2.2
+<<<<<<< HEAD
+    - docutils>=0.16ssss
+    - flask_wtf>=1.1.1
+    - h5py>=3.9.0
+=======
     - docutils>=0.16
     - flask_wtf>=1.1.1
     - h5py>=3.9.0
     - hotsoss>=0.1.9
+>>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - gunicorn>=21.1.0
     - numpy>=1.25.1
     - platon>=5.4
@@ -47,6 +53,10 @@ dependencies:
     - scipy>=1.11.1
     - sphinx_astropy>=1.9.1
     - svo-filters>=0.4.4
+<<<<<<< HEAD
+    - werkzeug>=3.0.1
+=======
     - werkzeug==2.0.3
+>>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - jwst_gtvt>=1.0.0
     - astroquery>=0.4.6
diff --git a/env/environment-3.9.yml b/env/environment-3.9.yml
@@ -35,7 +35,10 @@ dependencies:
     - docutils>=0.16
     - flask_wtf>=1.1.1
     - h5py>=3.9.0
+<<<<<<< HEAD
+=======
     - hotsoss>=0.1.9
+>>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - gunicorn>=21.1.0
     - markupsafe==2.0.1
     - numpy>=1.25.1
@@ -48,6 +51,10 @@ dependencies:
     - scipy>=1.11.1
     - sphinx_astropy>=1.9.1
     - svo-filters>=0.4.4
+<<<<<<< HEAD
+    - werkzeug>=3.0.1
+=======
     - werkzeug==2.0.3
+>>>>>>> c5ab1de0367f728b47615a8b555655631b23b1ca
     - jwst_gtvt>=1.0.0
     - astroquery>=0.4.6