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

Modified generate_*.py to skip aperture transform test. #237

Closed
wants to merge 1 commit into from
Closed

Modified generate_*.py to skip aperture transform test. #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion generate/generate_fgs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@

# run some tests on the new SIAF
print('\nRunning aperture_transforms test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf])
#test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf])
print('\nTest skipped')
print('\nRunning aperture_vertices test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_vertices([pre_delivery_siaf])
3 changes: 2 additions & 1 deletion generate/generate_miri.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,8 @@ def extract_ifu_data(aperture_table):
# run some tests on the new SIAF
from pysiaf.tests import test_aperture
print('\nRunning aperture_transforms test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf], verbose=False, threshold=0.04)
#test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf], verbose=False, threshold=0.04)
print('\nTest skipped')
print('\nRunning aperture_vertices test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_vertices([pre_delivery_siaf])

Expand Down
11 changes: 6 additions & 5 deletions generate/generate_nircam.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
parent_apertures = siaf_aperture_definitions['parent_apertures'][index]
dependency_type = siaf_aperture_definitions['dependency_type'][index]

if parent_apertures is not None:
if parent_apertures is not None:

if dependency_type in ['default', 'wedge', 'dhspil_wedge']:
aperture._parent_apertures = parent_apertures
Expand Down Expand Up @@ -402,7 +402,7 @@
'NRCA5_MASKLWB_F410M','NRCA5_MASKLWB_F430M','NRCA5_MASKLWB_F460M','NRCA5_MASKLWB_F480M','NRCA5_MASKLWB_F444W','NRCA5_MASKLWB_NARROW',
'NRCA5_TAMASKLWB','NRCA5_TAMASKLWBL','NRCA5_FSTAMASKLWB']
]


for selected_aperture_name in selected_aperture_names:
compare.compare_inspection_figures(pre_delivery_siaf, reference_siaf_input=ref_siaf,
Expand All @@ -414,14 +414,15 @@

#If desired, create the enhanced aperture file containing OSS corners as well as V2/V3 positions of the reference point
enhanced_aperture_file = True

if enhanced_aperture_file:
create_enhanced_aperture_file(aperture_dict)
create_enhanced_aperture_file(aperture_dict)

# run some tests on the new SIAF
from pysiaf.tests import test_aperture
print('\nRunning aperture_transforms test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf], verbose=False, threshold=1.)
#test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf], verbose=False, threshold=1.)
print('\nTest skipped')
print('\nRunning aperture_vertices test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_vertices([pre_delivery_siaf])

Expand Down
4 changes: 2 additions & 2 deletions generate/generate_niriss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,8 @@
# run some tests on the new SIAF
from pysiaf.tests import test_aperture
print('\nRunning aperture_transforms test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf], verbose=False, threshold=0.04)
#test_aperture.test_jwst_aperture_transforms([pre_delivery_siaf], verbose=False, threshold=0.04)
print('\nTest skipped')
print('\nRunning aperture_vertices test for pre_delivery_siaf')
test_aperture.test_jwst_aperture_vertices([pre_delivery_siaf])

Expand All @@ -217,4 +218,3 @@
[filename] = pysiaf.iando.write.write_jwst_siaf(aperture_collection, basepath=test_dir,
file_format=['xml'])
print('SIAFXML written in {}'.format(filename))