Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

NIRSpec Visibility Fix #619

Closed
wants to merge 1,044 commits into from
Closed

NIRSpec Visibility Fix #619

wants to merge 1,044 commits into from

Conversation

hover2pi
Copy link
Member

Fixes the NIRSpec Visibility calculation.

nespinoza and others added 30 commits May 12, 2022 16:33
@nespinoza
Merge pull request #538 from ExoCTK/develop
ca11c68 
Merging develop into master for v1.2.4 release
@hover2pi
Added model caching for LDC to speed up calculations
b7b3c7e
@hover2pi
Bump version to 1.2.5
af14630
@hover2pi
Merge conflicts again
9ea646f
@hover2pi
Downgrade batman because of install error in current
253c48a
@hover2pi
i am the batman
d25c264
@hover2pi
Me code pretty one day
19276fc
@hover2pi
Dinna dinna dinna dinnna dinna dinna dinna dinna BATMAM
29a391e
@hover2pi
more conflicts
76e9dd0
@hover2pi
Merge pull request #539 from ExoCTK/cache_ldc_model
2eabf2a 
LDC updates
@hover2pi
Merge pull request #534 from ExoCTK/dependabot/pip/paramiko-2.10.1
814f672 
Bump paramiko from 2.7.2 to 2.10.1
@hover2pi
merging with develop
9ad71e0
@jaymedina @hover2pi
update version in base.html
d8eab2c
@jaymedina @hover2pi
pep8 compliance
088df44
@falkben @hover2pi
add condition w/ badPAs
af4044c
@jaymedina @hover2pi
make binComp a list of floats
dafac1a
@jaymedina @hover2pi
removed print statement
83f28e2
@hover2pi
Added CHANGELOG.md to repo
6974767
@hover2pi
Minor edit
051c737
@bourque @hover2pi
Removed deprecated astropy.extern.six.StringIO dependency, replaced w…
da77f75 
…ith io.StringIO
@bourque @hover2pi
updated asteval dependency
e7f0b8b
@bourque @hover2pi
Attempting to kick-start GitHub which for some reason is not respondi…
047d9ba 
…ng to pushes
@hover2pi
Repaired logging code and added logging to all Web tools
6ae64a4
@hover2pi
Added throughputs from pandeia and helpers function to fetch them
f3e3adf
@hover2pi
Converted fits files to txt so svo_filters can read them and updated …
e9c4a1e 
…the list of filters so the JWST ones default to the repo files
@hover2pi
Updated LDC code to work with svo_filters 0.3.0
9a00d5d
@hover2pi
Checking if PyYAML install is case sensitive
8d7527d
@hover2pi
Trying to resolve scipy1.6.0 requires PyYAML5.1.0 but bandit requires…
6f91963 
… PyYAML5.3.1 or greater
@hover2pi
Removed bandit temporarily to see if builds pass
e206d28
@hover2pi
Bump svo_filters to v0.3.0 in py3.7 env
bbbb8dc
hover2pi and others added 26 commits July 2, 2024 16:05
@hover2pi
Replaced contam tool demo notebook
0085ba8
@hover2pi
Removed MAST download
ed9ce70
@hover2pi
Added SOSS coeffs and removed hotsoss dependency
c05853b
@hover2pi
Resolved merge conflicts
b1337c7
@hover2pi
Deleted old contam notebooks and updated new one.
8633837
@hover2pi
Resolved import conflict
e7e664c
@hover2pi
Merge branch 'develop' into contam_updates
f65ddc2
@hover2pi
Fixed Fortney grid select fields so no error is thrown
291c0d6
@hover2pi
Merge pull request #597 from ExoCTK/contam_updates
f4b3d58 
Adds proper motion correction and galaxy support to Contamination tool
@mfixstsci
Updated environment files
906dcf6
@mfixstsci
Typo fix
3d983be
@mfixstsci
Updating MIRI keyword for contam-viz
596e175
@mfixstsci
Remove merge conflict in requirements.txt
8878539
@hover2pi
Merge pull request #609 from mfixstsci/fix-merge-conflicts
445935e 
Resolve merge conflicts
@hover2pi
Merge pull request #608 from mfixstsci/contam-viz-instrument-keyword
1dc9556 
Fix MIRI LRS Contamination & Visibility
@hover2pi
Updated the version number in the footer
1944e65
@hover2pi
Updated plot description text on results page
c19efe7
@nespinoza
now visibility tool goes from Cycle 3 to 6
4f4fdb5
@hover2pi
Updated tooltips on contam plot
053d350
@hover2pi
Merge pull request #612 from nespinoza/new-visibility-dates
19f23d2 
Visibility tool goes from Cycle 3 to 6 now
@nespinoza
Merge pull request #613 from ExoCTK/v126_edits
ea5f3b9 
V126 edits
@hover2pi
Removed MIRI text from contam tool page
74febc5
@mfixstsci
Adding if else to avoid keyerror in field simulator
7c2a2cd
@hover2pi
Merge pull request #618 from mfixstsci/update-nrs-viz-plot
01e6e13 
Fix NRS Visibility Plot
@hover2pi
Fixes add_source call for contam companions
caabf34
@hover2pi
Merge pull request #615 from ExoCTK/patch
f130b8d 
Removed MIRI text from contam tool page
@hover2pi hover2pi requested a review from mfixstsci September 16, 2024 15:37
@mfixstsci
Copy link
Contributor

Still confused about how we ended up with commits from two years ago in this merge. From my investigations I think this might be the result of releasing from a branch that was not main in the past v.1.2.3 which was 2 years ago.

I think if we want to bring main up-to-date with develop that's fine and if we want to continue adding code into main that's okay too but when we are ready for a release, maybe we make a branch off of main that is version we are tagging and releasing.

So in this case, we can merge this, make a branch off of main called v1.2.6 and use that as the target branch of the release.

@hover2pi hover2pi closed this Sep 24, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mfixstsci mfixstsci mfixstsci approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@hover2pi @mfixstsci @nespinoza @jaymedina @falkben @bourque @pyup-bot @zacharyburnett