Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: discsim/frank
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.2.3
Choose a base ref
...
head repository: discsim/frank
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 13 commits
  • 5 files changed
  • 3 contributors

Commits on Aug 22, 2024

  1. Update README.md

    @jeffjennings
    jeffjennings authored Aug 22, 2024
    Copy the full SHA
    b46e8aa View commit details

Commits on Sep 3, 2024

  1. build(deps): bump actions/download-artifact in /.github/workflows 

    Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.1.7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](actions/download-artifact@v3...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
    @dependabot
    dependabot[bot] authored Sep 3, 2024
    Copy the full SHA
    6fd5bf3 View commit details

Commits on Sep 4, 2024

  1. Merge pull request #226 from discsim/dependabot/github_actions/dot-gi… 

    …thub/workflows/actions/download-artifact-4.1.7

build(deps): bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows
    @rbooth200
    rbooth200 authored Sep 4, 2024
    Copy the full SHA
    da62b9a View commit details

  2. updated upload-artifact

    @rbooth200
    rbooth200 committed Sep 4, 2024
    Copy the full SHA
    166477f View commit details

  3. Merge pull request #227 from discsim/docs_fix 

    updated upload-artifact
    @rbooth200
    rbooth200 authored Sep 4, 2024
    Copy the full SHA
    cccd148 View commit details

  4. updated upload-artifact

    @rbooth200
    rbooth200 committed Sep 4, 2024
    Copy the full SHA
    4d70d96 View commit details

  5. Merge pull request #228 from discsim/docs_fix 

    updated upload-artifact
    @rbooth200
    rbooth200 authored Sep 4, 2024
    Copy the full SHA
    6d696e2 View commit details

  6. updated other actions

    @rbooth200
    rbooth200 committed Sep 4, 2024
    Copy the full SHA
    388e09a View commit details

  7. Merge pull request #229 from discsim/docs_fix 

    updated other actions
    @rbooth200
    rbooth200 authored Sep 4, 2024
    Copy the full SHA
    484e6f4 View commit details

Commits on Oct 31, 2024

  1. Fixed typo in geometry printing

    @rbooth200
    rbooth200 committed Oct 31, 2024
    Copy the full SHA
    f773400 View commit details

  2. Merge pull request #230 from discsim/geom_bug 

    Fixed typo in geometry printing
    @jeffjennings
    jeffjennings authored Oct 31, 2024
    Copy the full SHA
    63f438f View commit details

  3. added chunking to interpolation

    @rbooth200
    rbooth200 committed Oct 31, 2024
    Copy the full SHA
    651a29e View commit details

  4. Merge pull request #231 from discsim/optimize_interp 

    added chunking to interpolation
    @jeffjennings
    jeffjennings authored Oct 31, 2024
    Copy the full SHA
    cdf8594 View commit details
Showing with 30 additions and 10 deletions.
  1. +5 −5 .github/workflows/docs.yml
  2. +2 −2 .github/workflows/tests.yml
  3. +1 −1 README.md
  4. +1 −1 frank/geometry.py
  5. +21 −1 frank/statistical_models.py
10 changes: 5 additions & 5 deletions .github/workflows/docs.yml
View file
Original file line number Diff line number Diff line change
@@ -18,10 +18,10 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: 3.12

@@ -59,7 +59,7 @@ jobs:
# only store the artifact for 'retention-days'
- name: Upload docs artifact
if: github.event.pull_request.merged == true
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.4.0
with:
name: built_docs
path: docs/_build/html
@@ -73,11 +73,11 @@ jobs:

steps:
- name: Checkout repo
uses: actions/checkout@v3
uses: actions/checkout@v4

# download the previously uploaded 'built_docs' artifact
- name: Download docs artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4.1.7
id: download
with:
name: built_docs
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@ jobs:

steps:
- name: Checkout code
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Set up Python ${{ matrix.python-version }}
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}

2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -106,6 +106,6 @@ License
-------
**frank** is free software licensed under the LGPLv3 License. For more details see the [LICENSE](https://github.com/discsim/frank/blob/master/LICENSE.txt).

© Copyright 2019-2022 Richard Booth, Jeff Jennings, Marco Tazzari.
© Copyright 2019-2024 Richard Booth, Jeff Jennings, Marco Tazzari.

Image: Universal Studios, NBCUniversal [Public domain]
2 changes: 1 addition & 1 deletion frank/geometry.py
View file
Original file line number Diff line number Diff line change
@@ -364,7 +364,7 @@ def rescale_factor(self):
return 1.0 / np.cos(self._inc * deg_to_rad)

def __repr__(self):
return "SourceGeometry(inc={}, PA={}, dRA={}, dDEC={})".format(
return "SourceGeometry(inc={}, PA={}, dRA={}, dDec={})".format(
self.inc, self.PA, self.dRA, self.dDec
)

22 changes: 21 additions & 1 deletion frank/statistical_models.py
View file
Original file line number Diff line number Diff line change
@@ -457,7 +457,27 @@ def interpolate(self, f, r, space='Real'):
"""
if space == 'Real':
r = r / rad_to_arcsec
return self._DHT.interpolate(f, r, space)

r = np.array(r)
shape = r.shape
r = r.reshape(-1)

if self._chunking:
Ni = int(self._chunk_size / len(r) + 1)
else:
Ni = len(r)

end = 0
start = 0
I = []
while end < len(r):
start = end
end = start + Ni
ri = r[start:end]

I.append(self._DHT.interpolate(f, ri, space))

return np.concatenate(I).reshape(*shape)


def _get_mapping_coefficients(self, qs, ks, geometry=None, inverse=False):