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.

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

Support the slightly non-square dimensions of the MIRI detector (1024, 1032) pixels in size. Fixes #676 #803

Merged
merged 2 commits into from
Feb 14, 2024

Conversation

mperrin
Copy link
Collaborator

@mperrin mperrin commented Feb 14, 2024

Addresses open issue #676. Minor extension to support detector dimensions which are not square.

@mperrin mperrin self-assigned this Feb 14, 2024
@pep8speaks
Copy link

pep8speaks commented Feb 14, 2024

Hello @mperrin, Thank you for updating !

Line 227:71: E114 indentation is not a multiple of four (comment)
Line 227:71: E116 unexpected indentation (comment)
Line 228:71: E114 indentation is not a multiple of four (comment)
Line 228:71: E116 unexpected indentation (comment)
Line 229:71: E114 indentation is not a multiple of four (comment)
Line 229:71: E116 unexpected indentation (comment)
Line 292:67: E226 missing whitespace around arithmetic operator
Line 298:69: E226 missing whitespace around arithmetic operator
Line 301:17: E303 too many blank lines (2)
Line 366:30: E225 missing whitespace around operator
Line 385:33: E231 missing whitespace after ','
Line 538:5: E731 do not assign a lambda expression, use a def
Line 561:23: E226 missing whitespace around arithmetic operator
Line 561:25: E226 missing whitespace around arithmetic operator
Line 562:28: E226 missing whitespace around arithmetic operator
Line 562:30: E226 missing whitespace around arithmetic operator
Line 563:23: E226 missing whitespace around arithmetic operator
Line 563:25: E226 missing whitespace around arithmetic operator
Line 564:23: E226 missing whitespace around arithmetic operator
Line 564:25: E226 missing whitespace around arithmetic operator
Line 565:23: E226 missing whitespace around arithmetic operator
Line 565:25: E226 missing whitespace around arithmetic operator
Line 567:27: E226 missing whitespace around arithmetic operator
Line 567:29: E226 missing whitespace around arithmetic operator
Line 567:32: E231 missing whitespace after ','
Line 568:27: E226 missing whitespace around arithmetic operator
Line 568:29: E226 missing whitespace around arithmetic operator
Line 568:32: E231 missing whitespace after ','
Line 570:48: E128 continuation line under-indented for visual indent
Line 571:48: E126 continuation line over-indented for hanging indent
Line 574:9: E303 too many blank lines (2)
Line 578:5: E303 too many blank lines (2)
Line 579:16: E226 missing whitespace around arithmetic operator
Line 584:31: E226 missing whitespace around arithmetic operator

Line 10:1: E402 module level import not at top of file
Line 14:1: E402 module level import not at top of file
Line 16:1: E731 do not assign a lambda expression, use a def
Line 17:1: E731 do not assign a lambda expression, use a def
Line 18:1: E731 do not assign a lambda expression, use a def
Line 20:1: E731 do not assign a lambda expression, use a def
Line 74:19: E201 whitespace after '('
Line 91:1: E302 expected 2 blank lines, found 1

Line 232:22: E701 multiple statements on one line (colon)
Line 311:26: E225 missing whitespace around operator
Line 350:36: E701 multiple statements on one line (colon)
Line 359:5: E303 too many blank lines (2)
Line 360:29: E127 continuation line over-indented for visual indent
Line 394:47: E114 indentation is not a multiple of four (comment)
Line 394:47: E116 unexpected indentation (comment)
Line 396:27: E701 multiple statements on one line (colon)
Line 397:39: E701 multiple statements on one line (colon)
Line 461:109: E202 whitespace before ')'
Line 476:33: E701 multiple statements on one line (colon)
Line 477:33: E701 multiple statements on one line (colon)
Line 479:72: W504 line break after binary operator
Line 480:37: W504 line break after binary operator
Line 489:43: E701 multiple statements on one line (colon)
Line 492:91: E701 multiple statements on one line (colon)
Line 493:92: E701 multiple statements on one line (colon)
Line 530:23: E126 continuation line over-indented for hanging indent
Line 620:48: E127 continuation line over-indented for visual indent
Line 711:29: E201 whitespace after '('
Line 726:1: E266 too many leading '#' for block comment
Line 800:63: E127 continuation line over-indented for visual indent
Line 801:63: E127 continuation line over-indented for visual indent
Line 802:63: E127 continuation line over-indented for visual indent
Line 803:63: E127 continuation line over-indented for visual indent
Line 861:9: E303 too many blank lines (3)
Line 916:5: E303 too many blank lines (2)
Line 945:18: E114 indentation is not a multiple of four (comment)
Line 945:18: E116 unexpected indentation (comment)
Line 976:5: E303 too many blank lines (2)
Line 984:54: E225 missing whitespace around operator
Line 1014:33: E261 at least two spaces before inline comment
Line 1149:87: E231 missing whitespace after ','
Line 1159:83: E231 missing whitespace after ','
Line 1164:53: E701 multiple statements on one line (colon)
Line 1167:9: E303 too many blank lines (2)
Line 1175:5: E303 too many blank lines (2)
Line 1211:5: E303 too many blank lines (2)
Line 1234:31: E701 multiple statements on one line (colon)
Line 1235:31: E701 multiple statements on one line (colon)
Line 1239:76: E231 missing whitespace after ','
Line 1245:5: E303 too many blank lines (2)
Line 1245:28: E241 multiple spaces after ','
Line 1280:59: E222 multiple spaces after operator
Line 1281:39: E225 missing whitespace around operator
Line 1284:24: E221 multiple spaces before operator
Line 1297:32: E261 at least two spaces before inline comment
Line 1317:42: E222 multiple spaces after operator
Line 1338:31: E261 at least two spaces before inline comment
Line 1348:98: E225 missing whitespace around operator
Line 1389:27: E225 missing whitespace around operator
Line 1392:26: E225 missing whitespace around operator
Line 1395:33: E225 missing whitespace around operator
Line 1402:36: E261 at least two spaces before inline comment
Line 1407:43: E261 at least two spaces before inline comment
Line 1427:27: E226 missing whitespace around arithmetic operator
Line 1428:49: E225 missing whitespace around operator
Line 1435:5: E303 too many blank lines (2)
Line 1435:54: E226 missing whitespace around arithmetic operator
Line 1459:49: E251 unexpected spaces around keyword / parameter equals
Line 1459:51: E251 unexpected spaces around keyword / parameter equals
Line 1499:80: E251 unexpected spaces around keyword / parameter equals
Line 1499:82: E251 unexpected spaces around keyword / parameter equals
Line 1511:9: E265 block comment should start with '# '
Line 1518:34: E231 missing whitespace after ':'
Line 1518:46: E231 missing whitespace after ':'
Line 1518:57: E231 missing whitespace after ':'
Line 1518:88: E231 missing whitespace after ':'
Line 1519:19: E231 missing whitespace after ','
Line 1520:19: E231 missing whitespace after ','
Line 1521:19: E231 missing whitespace after ','
Line 1524:23: E701 multiple statements on one line (colon)
Line 1551:13: E303 too many blank lines (2)
Line 1584:53: E226 missing whitespace around arithmetic operator
Line 1584:74: E226 missing whitespace around arithmetic operator
Line 1587:23: E231 missing whitespace after ','
Line 1588:23: E231 missing whitespace after ','
Line 1589:23: E231 missing whitespace after ','
Line 1591:23: E231 missing whitespace after ','
Line 1591:86: E203 whitespace before ','
Line 1592:23: E231 missing whitespace after ','
Line 1593:23: E231 missing whitespace after ','
Line 1595:23: E231 missing whitespace after ','
Line 1596:23: E231 missing whitespace after ','
Line 1597:23: E231 missing whitespace after ','
Line 1599:23: E231 missing whitespace after ','
Line 1600:23: E231 missing whitespace after ','
Line 1601:23: E231 missing whitespace after ','
Line 1603:23: E231 missing whitespace after ','
Line 1604:23: E231 missing whitespace after ','
Line 1605:23: E231 missing whitespace after ','
Line 1659:5: E303 too many blank lines (2)
Line 1659:62: E251 unexpected spaces around keyword / parameter equals
Line 1659:64: E251 unexpected spaces around keyword / parameter equals
Line 1705:13: E731 do not assign a lambda expression, use a def
Line 1707:13: E731 do not assign a lambda expression, use a def
Line 1722:12: E225 missing whitespace around operator
Line 1729:9: E266 too many leading '#' for block comment
Line 1729:9: E303 too many blank lines (3)
Line 1738:35: E226 missing whitespace around arithmetic operator
Line 1738:76: E225 missing whitespace around operator
Line 1738:78: E226 missing whitespace around arithmetic operator
Line 1741:45: E251 unexpected spaces around keyword / parameter equals
Line 1741:47: E251 unexpected spaces around keyword / parameter equals
Line 1742:74: E226 missing whitespace around arithmetic operator
Line 1742:86: E226 missing whitespace around arithmetic operator
Line 1746:42: E251 unexpected spaces around keyword / parameter equals
Line 1746:44: E251 unexpected spaces around keyword / parameter equals
Line 1747:42: E251 unexpected spaces around keyword / parameter equals
Line 1747:44: E251 unexpected spaces around keyword / parameter equals
Line 1748:42: E251 unexpected spaces around keyword / parameter equals
Line 1748:44: E251 unexpected spaces around keyword / parameter equals
Line 1757:9: E266 too many leading '#' for block comment
Line 1758:9: E266 too many leading '#' for block comment
Line 1773:13: E303 too many blank lines (2)
Line 1791:13: E303 too many blank lines (2)
Line 1818:26: E222 multiple spaces after operator
Line 1820:33: E116 unexpected indentation (comment)
Line 1822:48: E261 at least two spaces before inline comment
Line 1944:45: E128 continuation line under-indented for visual indent
Line 2005:5: E303 too many blank lines (2)
Line 2033:5: E303 too many blank lines (2)
Line 2126:29: E701 multiple statements on one line (colon)
Line 2159:63: E225 missing whitespace around operator
Line 2167:67: E225 missing whitespace around operator
Line 2169:67: E225 missing whitespace around operator
Line 2172:67: E225 missing whitespace around operator
Line 2174:67: E225 missing whitespace around operator
Line 2203:21: E225 missing whitespace around operator
Line 2205:23: E225 missing whitespace around operator
Line 2207:23: E225 missing whitespace around operator
Line 2209:23: E225 missing whitespace around operator
Line 2235:22: E222 multiple spaces after operator
Line 2250:5: E303 too many blank lines (2)
Line 2268:34: E261 at least two spaces before inline comment
Line 2279:29: E231 missing whitespace after ','
Line 2285:19: E261 at least two spaces before inline comment
Line 2286:69: E226 missing whitespace around arithmetic operator
Line 2287:19: E225 missing whitespace around operator
Line 2294:21: E225 missing whitespace around operator
Line 2312:27: E225 missing whitespace around operator
Line 2330:22: E701 multiple statements on one line (colon)
Line 2428:80: W504 line break after binary operator
Line 2460:57: E202 whitespace before ')'
Line 2474:25: E222 multiple spaces after operator
Line 2474:34: E261 at least two spaces before inline comment
Line 2490:67: E203 whitespace before ':'
Line 2493:65: E124 closing bracket does not match visual indentation
Line 2497:65: E124 closing bracket does not match visual indentation
Line 2501:65: E124 closing bracket does not match visual indentation
Line 2510:65: E128 continuation line under-indented for visual indent
Line 2521:62: E114 indentation is not a multiple of four (comment)
Line 2521:62: E116 unexpected indentation (comment)
Line 2526:9: E303 too many blank lines (2)
Line 2537:1: E302 expected 2 blank lines, found 1
Line 2559:33: E116 unexpected indentation (comment)
Line 2578:29: E701 multiple statements on one line (colon)
Line 2648:1: E303 too many blank lines (3)
Line 2800:62: W504 line break after binary operator
Line 2836:34: E261 at least two spaces before inline comment
Line 2840:26: E226 missing whitespace around arithmetic operator
Line 2907:61: E226 missing whitespace around arithmetic operator
Line 3012:37: E701 multiple statements on one line (colon)
Line 3023:32: E701 multiple statements on one line (colon)

Comment last updated at 2024-02-14 16:43:29 UTC

@mperrin mperrin added the JWST Affects JWST models in WebbPSF label Feb 14, 2024
@mperrin mperrin added this to the Release 1.3 milestone Feb 14, 2024
Copy link
Collaborator

@BradleySappington BradleySappington left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks for including a test!

@mperrin
Copy link
Collaborator Author

mperrin commented Feb 14, 2024

I see the tests are failing. Stand by for fixes to the other parts of the code that break because of this...

Copy link

codecov bot commented Feb 14, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (01fa6a7) 55.12% compared to head (0d34e99) 55.17%.
Report is 1 commits behind head on develop.

Files Patch % Lines
webbpsf/webbpsf_core.py 90.00% 1 Missing ⚠️
Additional details and impacted files
@@             Coverage Diff             @@
##           develop     #803      +/-   ##
===========================================
+ Coverage    55.12%   55.17%   +0.05%     
===========================================
  Files           16       16              
  Lines         6625     6633       +8     
===========================================
+ Hits          3652     3660       +8     
  Misses        2973     2973              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mperrin mperrin merged commit f3973c1 into spacetelescope:develop Feb 14, 2024
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
JWST Affects JWST models in WebbPSF
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants