search

spacetelescope / pysiaf

Handling of Science Instrument Aperture Files (SIAF) for space telescopes
https://pysiaf.readthedocs.io
BSD 3-Clause "New" or "Revised" License
13 stars 28 forks source link

Aperture updates related to JSOCOPS-24 (limited to Grism Time Series) #254

Closed mgennaro closed 2 years ago

mgennaro commented 2 years ago

Under this PR NIRCam will deliver the follwoing changes:

mgennaro commented 2 years ago

This PR is ready for review

Witchblade101 commented 2 years ago

Deleted comments that were intended for #261 after copying them there.

Witchblade101 commented 2 years ago

Complicated conflicts:

remote: Enumerating objects: 31, done. remote: Counting objects: 100% (31/31), done. remote: Compressing objects: 100% (5/5), done. remote: Total 31 (delta 26), reused 30 (delta 26), pack-reused 0 Unpacking objects: 100% (31/31), 2.87 KiB | 133.00 KiB/s, done. From https://github.com/mgennaro/pysiaf

I'll start resolving things by deleting the previous output files.

Witchblade101 commented 2 years ago

`<<<<<<< JWSTSIAF-186

make figures for JWSTSIAF-186 Jira ticket

        selected_aperture_names = [['NRCA1_GRISMTS256','NRCA1_GRISMTS128','NRCA1_GRISMTS64'],
                                   ['NRCA3_GRISMTS256','NRCA3_GRISMTS128','NRCA3_GRISMTS64'],
                                   ['NRCA5_TAGRISMTS32','NRCA5_TAGRISMTS32_F405N']
                                   ]

=======

make figures for JWSTSIAF-242 Jira ticket

        selected_aperture_names = [['NRCB{}_SUB160'.format(sca) for sca in ['5','1','2','3','4']],
                                   ['NRCB{}_SUB320'.format(sca) for sca in ['5','1','2','3','4']],
                                   ['NRCB{}_SUB640'.format(sca) for sca in ['5','1','2','3','4']],
                                   ['NRCB5_SUB64P','NRCB1_SUB64P','NRCB5_FULL','NRCB1_FULL'],
                                   ['NRCB5_SUB160P','NRCB1_SUB160P','NRCB5_FULL','NRCB1_FULL'],
                                   ['NRCB5_SUB400P','NRCB1_SUB400P','NRCB5_FULL','NRCB1_FULL'],
                                   ['NRCB1_SUB64P','NRCB1_SUB160P','NRCB1_SUB400P','NRCB5_SUB64P','NRCB5_SUB160P','NRCB5_SUB400P']
                                  ]

siaf-updates`

I think selected_aperture_names needs to have all of the apertures for both tickets, then we'll be good to go.

mgennaro commented 2 years ago

yes, you can choose to have them both, or because you already produced the figures for 242, you can actually leave just those for 186 and post those to the JWSTSIAF-186 ticket. I was actually expecting this one to be the 1 conflict caused by me.

Witchblade101 commented 2 years ago

Right, I see what you're saying. It is just the loop that creates the figures.

I merged them locally, and it worked with no problems, but I think it makes more sense to do the auxiliary files in their separate tickets.

mgennaro commented 2 years ago

I actually could solve the conflict myself (I probably have write privileges because this is my PR). I chose to go with -186 only, becuase we already have the plots for 242

Witchblade101 commented 2 years ago

Sounds good.

mgennaro commented 2 years ago

This approach is also more similar to the typical sequential flow we use for when we do updates one ticket at a time. I.e. we modify the siaf-upadtes version of generate_nircam to put the "new" plots in that statement that was giving conflict. We usually do not have conflicts because the feature branch is the one and only feature branch that is branched off siaf-updates, but in this case we had 2 branches branched off at the same point in time from siaf-updates and the merging of the jwstsiaf-242 PR into siaf-updates has caused this minor conflict that indeed was expected.

Witchblade101 commented 2 years ago

Uh-oh, we just did something bad. This last PR deleted all of the NIRSpec data:

======================================================= short test summary info ======================================================== FAILED test_aperture.py::test_raw_transformations - FileNotFoundError: [Errno 2] No such file or directory: '/Users/dlong/pysiaf/pysi... FAILED test_nirspec.py::test_against_test_data - FileNotFoundError: [Errno 2] No such file or directory: '/Users/dlong/pysiaf/pysiaf/... FAILED test_nirspec.py::test_nirspec_aperture_transforms - FileNotFoundError: [Errno 2] No such file or directory: '/Users/dlong/pysi... FAILED test_nirspec.py::test_nirspec_slit_transformations - FileNotFoundError: [Errno 2] No such file or directory: '/Users/dlong/pys... FAILED test_nirspec.py::test_sci_det_consistency - FileNotFoundError: [Errno 2] No such file or directory: '/Users/dlong/pysiaf/pysia... FAILED test_plotting.py::test_aperture_plotting - FileNotFoundError: [Errno 2] No such file or directory: '/Users/dlong/pysiaf/pysiaf... ==================================================== 6 failed, 26 passed in 24.37s =====================================================

Witchblade101 commented 2 years ago

I think I can just try a new branch and pull those in from master...

mgennaro commented 2 years ago

Holy cow...that is my fault:

https://github.com/spacetelescope/pysiaf/pull/254/commits/569b8d1a40b001d27bdfa765cf4e251b95300955

I was just seeing all these "._" files in my branch and I git rm-ed them, but it looks like i removed also the actual files. OMG I am so sorry.