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

mgennaro · 2022-06-07T01:32:40Z

Under this PR NIRCam will deliver the follwoing changes:

F444W field point (several GRISMTS apertures in SIAF): Shift X by -94 LW px (DMS oriented).
NRCA3 and NRCA1 GRISM128 aperture: Shift Y by -8 SW px (DMS orientation)
NRCA3 and NRCA1 GRISM64 aperture: Shift Y by -10 SW px (DMS orientation)
Adjust the NRCA5_TAGRISMTS32_F405N:
- Target should move up and right in DMS/Science coordinates
  - Delta X = +0.165 LW px
  - Delta Y = +0.16 LW px

mgennaro · 2022-06-07T17:52:49Z

This PR is ready for review

Witchblade101 · 2022-06-08T16:33:50Z

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

Witchblade101 · 2022-06-11T00:16:20Z

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

branch JWSTSIAF-186 -> FETCH_HEAD
Removing pysiaf/source_data/NIRSpec/nirspec_siaf_detector_parameters.txt
Removing pysiaf/source_data/NIRSpec/nirspec_siaf_ddc_apername_mapping.txt
Removing pysiaf/source_data/NIRSpec/nirspec_siaf_aperture_definition.txt
Removing pysiaf/source_data/NIRSpec/delivery/test_data/apertures_testData/sky_fpa_projectionMSA_Q4.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/apertures_testData/sky_fpa_projectionMSA_Q3.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/apertures_testData/sky_fpa_projectionMSA_Q2.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/apertures_testData/sky_fpa_projectionMSA_Q1.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataWithGWATilt/testDataTA_SCA492F140X.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataWithGWATilt/testDataTA_SCA492F110W.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataWithGWATilt/testDataTA_SCA492CLEAR.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataWithGWATilt/testDataTA_SCA491F140X.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataWithGWATilt/testDataTA_SCA491F110W.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataWithGWATilt/testDataTA_SCA491CLEAR.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataNoTilt/testDataTA_SCA492F140X.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataNoTilt/testDataTA_SCA492F110W.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataNoTilt/testDataTA_SCA492CLEAR.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataNoTilt/testDataTA_SCA491F140X.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataNoTilt/testDataTA_SCA491F110W.fits
Removing pysiaf/source_data/NIRSpec/delivery/test_data/TA_testDataNoTilt/testDataTA_SCA491CLEAR.fits
Removing pysiaf/source_data/NIRSpec/delivery/positionsSIAFApertures.fits
Removing pysiaf/source_data/NIRSpec/delivery/disperser_MIRROR_TiltY_TA.gtp
Removing pysiaf/source_data/NIRSpec/delivery/disperser_MIRROR_TiltX_TA.gtp
Removing pysiaf/source_data/NIRSpec/delivery/delivery_SCA492toGWA.pcf
Removing pysiaf/source_data/NIRSpec/delivery/delivery_SCA491toGWA.pcf
Removing pysiaf/source_data/NIRSpec/delivery/delivery_F140X_GWA2XanYan.pcf
Removing pysiaf/source_data/NIRSpec/delivery/delivery_F110W_GWA2XanYan.pcf
Removing pysiaf/source_data/NIRSpec/delivery/delivery_CLEAR_GWA2XanYan.pcf
Removing pysiaf/source_data/NIRSpec/delivery/OTE.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_F290LP.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_F170LP.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_F140X.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_F110W.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_F100LP.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_F070LP.pcf
Removing pysiaf/source_data/NIRSpec/delivery/Fore_CLEAR.pcf
Auto-merging pysiaf/source_data/NIRCam/nircam_siaf_aperture_definition.txt
CONFLICT (rename/delete): pysiaf/pre_delivery_data/NIRCam/nircam_roundtrip_PRDOPSSOC-045-003_pre-delivery.txt deleted in fca75c1 and renamed to pysiaf/pre_delivery_data/NIRCam/nircam_roundtrip_PRDOPSSOC-051_pre-delivery.txt in HEAD. Version HEAD of pysiaf/pre_delivery_data/NIRCam/nircam_roundtrip_PRDOPSSOC-051_pre-delivery.txt left in tree.
CONFLICT (modify/delete): pysiaf/pre_delivery_data/NIRCam/nircam_enhanced_siaf_aperture_definition.txt deleted in fca75c1 and modified in HEAD. Version HEAD of pysiaf/pre_delivery_data/NIRCam/nircam_enhanced_siaf_aperture_definition.txt left in tree.
CONFLICT (modify/delete): pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xml deleted in fca75c1 and modified in HEAD. Version HEAD of pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xml left in tree.
CONFLICT (modify/delete): pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xlsx deleted in fca75c1 and modified in HEAD. Version HEAD of pysiaf/pre_delivery_data/NIRCam/NIRCam_SIAF.xlsx left in tree.
Auto-merging generate/generate_nircam.py
CONFLICT (content): Merge conflict in generate/generate_nircam.py
Automatic merge failed; fix conflicts and then commit the result.

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

Witchblade101 · 2022-06-11T01:07:39Z

`<<<<<<< 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 · 2022-06-11T02:51:10Z

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 · 2022-06-11T02:59:50Z

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 · 2022-06-11T03:00:30Z

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 · 2022-06-11T03:01:10Z

Sounds good.

mgennaro · 2022-06-11T03:04:10Z

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

I think this is what we want. After merging I'll check everything in the new siaf-updates, generate the files, and open a new PR.

Witchblade101 · 2022-06-11T03:18:43Z

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 · 2022-06-11T03:20:08Z

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

mgennaro · 2022-06-11T03:22:56Z

Holy cow...that is my fault:

569b8d1

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.

Mario Gennaro added 3 commits June 6, 2022 20:50

Setting up the branch

569b8d1

Modified the F444W GRISM TS apertures on A5

5e3d34d

Modified also the NRCA5_TAGRISMTS_SCI_F444W aperture

6bc5e56

mgennaro changed the title ~~Aperture updates related to JSOCOPS-24 (limited to Grism Time Series)~~ [WIP] Aperture updates related to JSOCOPS-24 (limited to Grism Time Series) Jun 7, 2022

Mario Gennaro added 2 commits June 7, 2022 11:34

Modifed the A1/A3 apertures location for GRISM TS 64/128

6d8d19c

Modified the reference position for the NRCA5_TAGRISMTS32_F405N aperture

fca75c1

mgennaro changed the title ~~[WIP] Aperture updates related to JSOCOPS-24 (limited to Grism Time Series)~~ Aperture updates related to JSOCOPS-24 (limited to Grism Time Series) Jun 7, 2022

Witchblade101 mentioned this pull request Jun 8, 2022

Dummy release #261

Merged

spacetelescope deleted a comment from tonysohn Jun 8, 2022

mgennaro mentioned this pull request Jun 10, 2022

Investigate .gitgnore issues #264

Open

Merge branch 'siaf-updates' into JWSTSIAF-186

8e2d01c

Witchblade101 approved these changes Jun 11, 2022

View reviewed changes

Witchblade101 merged commit df4c6a0 into spacetelescope:siaf-updates Jun 11, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

mgennaro commented Jun 7, 2022

mgennaro commented Jun 7, 2022

Witchblade101 commented Jun 8, 2022

Witchblade101 commented Jun 11, 2022

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022 •

edited

Loading

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022 •

edited

Loading

Witchblade101 left a comment

Witchblade101 commented Jun 11, 2022

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022 •

edited

Loading

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

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

Conversation

mgennaro commented Jun 7, 2022

mgennaro commented Jun 7, 2022

Witchblade101 commented Jun 8, 2022

Witchblade101 commented Jun 11, 2022

Witchblade101 commented Jun 11, 2022

`<<<<<<< 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'] ]

mgennaro commented Jun 11, 2022 • edited Loading

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022 • edited Loading

Witchblade101 left a comment

Choose a reason for hiding this comment

Witchblade101 commented Jun 11, 2022

Witchblade101 commented Jun 11, 2022

mgennaro commented Jun 11, 2022 • edited Loading

`<<<<<<< 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']
]

mgennaro commented Jun 11, 2022 •

edited

Loading

mgennaro commented Jun 11, 2022 •

edited

Loading

mgennaro commented Jun 11, 2022 •

edited

Loading