JWSTSIAF-156, add DHS-related apertures to NIRCam SIAF in support of Cycle 4 CfP

[mgennaro]

No description provided.

[Witchblade101]

@mgennaro Can you check these conflicts?

[mgennaro]

Hi @Witchblade101 , somehow I cannot see the conflicts directly (or please tell me how), but I believe I know what you are seeing, because I merged this PR branch AND PR branch for PR #339 locally and I had to solve some myself. I basically created the 2 PRs in questions both starting from the siaf-updates branch. I then modified the nircam_apertures_definition file in each of them separately. Since the 2 modifications are independent (ie they introduce 2 new apertures set, that are different in each PR), that file doesn't show any conflict...good, because that's the only file that truly matters. I changed generate_nircam independently in each PR, because for the 2 branches I want to see 2 different sets of plots. Hence, you should generate the plots to attach to the individual SIAF tickets using the branch-specific version of generate_nircam OR merge the 2 lists of lists around line 390 into a single list and solve that conflict. At that point you can merge this PR and work on the merged siaf-updates branch (and attach ALL plots to both tickets). All that changes is a list of plotted apertures, i.e. the the code that generates the SIAF itself is unchanged. And I guess the SIAF.xml and SIAF.xlsx conflicts are coming because you are comparing this PR to the "now" state of siaf-updates, which has PR#339 already merged. I think you can ignore merging SIAF.xml and SIAF.xlsx from this branch into the siaf_updates branch, i.e. you could solve the conflict by deleting either version of those 2 files (either the siaf-updates ones or the #341 ones). Then once you merge this branch (and obtain the new nircam_aperture_definition and the new generate_nircam ) you need to rerun the generate_nircam script locally, and add and commit those SIAF xml/xlsx files to the siaf-updates remote branch. You should be able to see the "DHS" apertures in SIAF as well as the "FP6" ones. If you see both sets, then we're good.
BTW, I don't even know why stuff in pre_delivery_data is showing up in the conflicts list, since I do not think I added/committed any of those files.

[mfixstsci]

@mgennaro thanks for the comment. Somehow, the pre-delivery data keeps making its way into the repo. I am going to pull the branch and see what the differences are.

[mfixstsci]

Looks like its coming from #339 the file changes show the addition of Relic which I don't believe the institute is supporting (there are references to python 3.7 there 😓).

[mfixstsci]

@Witchblade101 and @mgennaro looks like the tests are passing and the conflicts are resolved. Before merging can we confirm that the apertures are correct?

Thanks!

pysiaf/generate/generate_nircam.py

Line 392 in c1a01ac

selected_aperture_names = [['NRCA3_FP1','NRCA3_FP1_SUB8','NRCA3_FP1_SUB64'],

[mgennaro]

@mfixstsci I confirm that the joined set of aperture names is the correct one

[Witchblade101]

This looks good