search

lsst-ts / ts_phosim

High-Level Module to Perturb the PhoSim
GNU General Public License v3.0
0 stars 1 forks source link

Conversion from Zernikes to PSF FWHM [tickets/DM-33115] #72

Closed jfcrenshaw closed 1 year ago

jfcrenshaw commented 1 year ago

Supersedes PR #65. This uses the new Instrument code implemented by Bryce.

jfcrenshaw commented 1 year ago

I have no idea why all those commits from @jbkalmbach with the message "Merge branch 'develop'" are listed above. If you look at them, they all show the same changes that my commit made. When I inspect the branch history locally, this doesn't happen, so I think this is just a Github bug?

jfcrenshaw commented 1 year ago

If the tests all pass, I will make this a real PR and request review

teweitsai commented 1 year ago

Based on the commit status, this ticket branch should do the rebase before the PR or merge. In addition, why does the history become this: image

Can anyone explain the condition of tags of develop and main here? @suberlak and @jbkalmbach Please help to check where the develop and main branches should be (which commits) and help for the rebase of this ticket branch is needed. Thanks!

Note. Actually, I am very confusing why the latest commit has no branchtag on it?