Merge pull request #294 from Ciela-Institute/dev

Dev
Ciela-Institute · Nov 29, 2024 · 58c0b67 · 58c0b67
2 parents e81189e + efd0efa
commit 58c0b67
Show file tree

Hide file tree

Showing 3 changed files with 98 additions and 47 deletions.
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,43 +1,98 @@
-cff-version: 1.0.0
-message: "If you use this software, please cite the JOSS paper."
+cff-version: "1.2.0"
 authors:
-- family-names: "Stone"
-  given-names: "Connor"
+- family-names: Stone
+  given-names: Connor
   orcid: "https://orcid.org/0000-0002-9086-6398"
-- family-names: "Adam"
-  given-names: "Alexandre"
+- family-names: Adam
+  given-names: Alexandre
   orcid: "https://orcid.org/0000-0001-8806-7936"
-- family-names: "Coogan"
-  given-names: "Adam"
+- family-names: Coogan
+  given-names: Adam
   orcid: "https://orcid.org/0000-0002-0055-1780"
-- family-names: "Yantovski-Barth"
-  given-names: "Misha"
+- family-names: Yantovski-Barth
+  given-names: M. J.
   orcid: "https://orcid.org/0000-0001-5200-4095"
-- family-names: "Filipp"
-  given-names: "Andreas"
+- family-names: Filipp
+  given-names: Andreas
   orcid: "https://orcid.org/0000-0003-4701-3469"
-- family-names: "Setiawan"
-  given-names: "Landung"
+- family-names: Setiawan
+  given-names: Landung
   orcid: "https://orcid.org/0000-0002-1624-2667"
-- family-names: "Core"
-  given-names: "Cordero"
+- family-names: Core
+  given-names: Cordero
   orcid: "https://orcid.org/0000-0002-3531-3221"
-- family-names: "Legin"
-  given-names: "Ronan"
+- family-names: Legin
+  given-names: Ronan
   orcid: "https://orcid.org/0000-0001-9459-6316"
-- family-names: "Wilson"
-  given-names: "Charles"
+- family-names: Wilson
+  given-names: Charles
   orcid: "https://orcid.org/0000-0001-7071-5528"
-- family-names: "Missael Barco"
-  given-names: "Gabriel"
+- family-names: Barco
+  given-names: Gabriel Missael
   orcid: "https://orcid.org/0009-0008-5839-5937"
-- family-names: "Perreault-Levasseur"
-  given-names: "Laurence"
-  orcid: "https://orcid.org/0000-0003-3544-3939"
-- family-names: "Hezaveh"
-  given-names: "Yashar"
+- family-names: Hezaveh
+  given-names: Yashar
   orcid: "https://orcid.org/0000-0002-8669-5733"
-title: "caustics"
+- family-names: Perreault-Levasseur
+  given-names: Laurence
+  orcid: "https://orcid.org/0000-0003-3544-3939"
+contact:
+- family-names: Stone
+  given-names: Connor
+  orcid: "https://orcid.org/0000-0002-9086-6398"
 doi: 10.5281/zenodo.10806382
-abstract: "The lensing pipeline of the future: GPU-accelerated, automatically-differentiable, highly modular. Currently under heavy development."
-repository-code: "https://github.com/Ciela-Institute/caustics"
+message: If you use this software, please cite our article in the
+  Journal of Open Source Software.
+preferred-citation:
+  authors:
+  - family-names: Stone
+    given-names: Connor
+    orcid: "https://orcid.org/0000-0002-9086-6398"
+  - family-names: Adam
+    given-names: Alexandre
+    orcid: "https://orcid.org/0000-0001-8806-7936"
+  - family-names: Coogan
+    given-names: Adam
+    orcid: "https://orcid.org/0000-0002-0055-1780"
+  - family-names: Yantovski-Barth
+    given-names: M. J.
+    orcid: "https://orcid.org/0000-0001-5200-4095"
+  - family-names: Filipp
+    given-names: Andreas
+    orcid: "https://orcid.org/0000-0003-4701-3469"
+  - family-names: Setiawan
+    given-names: Landung
+    orcid: "https://orcid.org/0000-0002-1624-2667"
+  - family-names: Core
+    given-names: Cordero
+    orcid: "https://orcid.org/0000-0002-3531-3221"
+  - family-names: Legin
+    given-names: Ronan
+    orcid: "https://orcid.org/0000-0001-9459-6316"
+  - family-names: Wilson
+    given-names: Charles
+    orcid: "https://orcid.org/0000-0001-7071-5528"
+  - family-names: Barco
+    given-names: Gabriel Missael
+    orcid: "https://orcid.org/0009-0008-5839-5937"
+  - family-names: Hezaveh
+    given-names: Yashar
+    orcid: "https://orcid.org/0000-0002-8669-5733"
+  - family-names: Perreault-Levasseur
+    given-names: Laurence
+    orcid: "https://orcid.org/0000-0003-3544-3939"
+  date-published: 2024-11-22
+  doi: 10.21105/joss.07081
+  issn: 2475-9066
+  issue: 103
+  journal: Journal of Open Source Software
+  publisher:
+    name: Open Journals
+  start: 7081
+  title: "Caustics: A Python Package for Accelerated Strong
+    Gravitational Lensing Simulations"
+  type: article
+  url: "https://joss.theoj.org/papers/10.21105/joss.07081"
+  volume: 9
+title: "Caustics: A Python Package for Accelerated Strong Gravitational
+  Lensing Simulations"
diff --git a/docs/source/citation.rst b/docs/source/citation.rst
@@ -3,23 +3,19 @@
 Citation
 ========
 
-Paper is submitted to JOSS, in the meantime please cite the `arXiv version <https://arxiv.org/abs/2406.15542>`_ of the paper:
+The `caustics release paper <https://joss.theoj.org/papers/10.21105/joss.07081#>`_ is published JOSS, please cite this article if you use caustics in your research.:
 
 .. code-block:: bibtex
 
-    @ARTICLE{2024arXiv240615542S,
-        author = {{Stone}, Connor and {Adam}, Alexandre and {Coogan}, Adam and {Yantovski-Barth}, M.~J. and {Filipp}, Andreas and {Setiawan}, Landung and {Core}, Cordero and {Legin}, Ronan and {Wilson}, Charles and {Missael Barco}, Gabriel and {Hezaveh}, Yashar and {Perreault-Levasseur}, Laurence},
-            title = "{Caustics: A Python Package for Accelerated Strong Gravitational Lensing Simulations}",
-        journal = {arXiv e-prints},
-        keywords = {Astrophysics - Instrumentation and Methods for Astrophysics, Astrophysics - Cosmology and Nongalactic Astrophysics},
-            year = 2024,
-            month = jun,
-            eid = {arXiv:2406.15542},
-            pages = {arXiv:2406.15542},
-            doi = {10.48550/arXiv.2406.15542},
-    archivePrefix = {arXiv},
-        eprint = {2406.15542},
-    primaryClass = {astro-ph.IM},
-        adsurl = {https://ui.adsabs.harvard.edu/abs/2024arXiv240615542S},
-        adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+    @article{Stone2024,
+        title = {Caustics: A Python Package for Accelerated Strong Gravitational Lensing Simulations},
+        author = {Connor Stone and Alexandre Adam and Adam Coogan and M. J. Yantovski-Barth and Andreas Filipp and Landung Setiawan and Cordero Core and Ronan Legin and Charles Wilson and Gabriel Missael Barco and Yashar Hezaveh and Laurence Perreault-Levasseur},
+        year = {2024},
+        journal = {Journal of Open Source Software},
+        volume = {9},
+        number = {103},
+        pages = {7081},
+        doi = {10.21105/joss.07081},
+        publisher = {The Open Journal},
+        url = {https://doi.org/10.21105/joss.07081}
     }
diff --git a/src/caustics/utils.py b/src/caustics/utils.py
@@ -517,7 +517,7 @@ def interp2d(
         raise ValueError(f"x must be 0 or 1D (received {x.ndim}D tensor)")
     if y.ndim > 1:
         raise ValueError(f"y must be 0 or 1D (received {y.ndim}D tensor)")
-    if padding_mode not in ["extrapolate", "zeros"]:
+    if padding_mode not in ["extrapolate", "clamp", "zeros"]:
         raise ValueError(f"{padding_mode} is not a valid padding mode")
 
     if padding_mode == "clamp":