Srikrishna Sekhar 5bc4a3a7b58 CAS-13901 : Remove asp niter check in test_deconvolve
The niter passing criterion has been removed from the asp test within
test_task_deconvolve. This brings it in line with the same test within
test_task_tclean as well.
The issue is that the LBFGS minimizer within the asp code is known to
follow different paths on different system platforms, which can
potentially explain the discrepancy in the niter accumulated on Linux vs
Mac.
Removing this test allows it to be run on a Mac (rather than skipped),
and given that the final image values are within tolerance on all
systems it indicates that the images are scientifically equivalent
despite the niter being different. CAS-13901 : Remove asp niter check in test_deconvolve The niter passing criterion has been removed from the asp test within
test_task_deconvolve. This brings it in line with the same test within
test_task_tclean as well.
The issue is that the LBFGS minimizer within the asp code is known to
follow different paths on different system platforms, which can
potentially explain the discrepancy in the niter accumulated on Linux vs
Mac.
Removing this te... 26 Feb 2024 CAS-13901 smcastro bc1d06d17a8 Enabled previously skipped tests 5, 53, 68, 71 87, and 90 because they are passing again. Added skip to tests 72 and 91 as both of them crash on macOS and seem to cause
interferences on other tests as mentioned in comments in the script.
Note that test_onefield_asp still fails with a numerical difference when run on macOS ARM hardware.
Increased the timeout to run tests deconvolve and sdintimaging, needed by Bamboo
on old RHEL7 cvpost nodes. 23 Feb 2024 Srikrishna Sekhar 545f519b331 M Merge remote-tracking branch 'origin/master' into CAS-13901 21 Feb 2024 CAS-13901 Ville Suoranta 320ea757542 M Pull request #778: CAS-14093 Merge in CASA/casa6 from CAS-14093 to master
* commit '19913d87ffc730f6fa3dc4b4f9f32a663004e698': (37 commits)
Update build.conf versions casaplotserver 1.8.1, casaplotms 2.4.1, casalogger 1.0.18, casafeather 0.0.21, casatablebrowser 0.0.34
Update plotms in build.conf
Fix build.conf plotms
Update plotserver version
Update build.conf to dev versions
Update PlotMS in build.conf to 2.... 21 Feb 2024 CAS-14093 Takeshi Nakazato 66bed521c76 M Pull request #777: CAS-14266 Merge in CASA/casa6 from CAS-14266 to master
* commit '35aa5b675a4d465b976538cdcd112c1f70eb3772':
CAS-14266 do not initialize UVWMachine for single-dish imaging 16 Feb 2024 CAS-14266 Ville Suoranta 19913d87ffc Update build.conf versions casaplotserver 1.8.1, casaplotms 2.4.1, casalogger 1.0.18, casafeather 0.0.21, casatablebrowser 0.0.34 16 Feb 2024 Ville Suoranta aa41bdeada3 Update plotms in build.conf 16 Feb 2024 Ville Suoranta 192ab305cd1 M Merge branch 'master' into CAS-14093 16 Feb 2024 CAS-14093 Srikrishna Sekhar f871f24268c CAS-13901 : Change gain to 0.1 in asp test Reduced gain even further to 0.1 (from 0.2) in the test_onefield_asp
test to fix the issue with the test failing on Intel Macs. The test
passing criteria have been appropriately updated.
Preliminary tests from Sandra indicate that this has worked. 15 Feb 2024 CAS-13901 Ville Suoranta a24aff35f28 M Pull request #775: Update Casacore to f1c629840e Merge in CASA/casa6 from CAS-14274 to master
* commit '0ea19da0cbb2b20ba84125a4a91978e020429fdc':
Update Casacore to f1c629840e 14 Feb 2024 CAS-14274 Takeshi Nakazato 35aa5b675a4 M Merge branch 'master' into CAS-14266 13 Feb 2024 CAS-14266 Srikrishna Sekhar 78334a52026 M Pull request #776: CAS-14184 Merge in CASA/casa6 from CAS-14184 to master
* commit '23ace523ef21f0c5a04b5bd5f527a147712e0274': (55 commits)
CAS-14184 : Fix test to account for previous change
CAS-14184 : Remove print statements in deconvolve
CAS-14184 : Fix to deconvolve return dict
CAS-14184 : Fixes to gclean tests + masking bugfix
fixed typo in json entry.
Renamed test_task_gclean to test_imagerhelpers_gclea... 11 Feb 2024 CAS-14184 Srikrishna Sekhar 23ace523ef2 CAS-14184 : Fix test to account for previous change The "test_mask_preserve_input_zero_mask" test in test_task_deconvolve
was failing because of the wrong stopcode. As of the previous commit the
stopcode is now over-written by the niter=0 dict, rather than what is
written by the C++ code. This has no operation impact apart from the
specific niter=0 case, and the stopcode for this test had to be changed
to reflect that. 08 Feb 2024 CAS-14184 Srikrishna Sekhar a467ec080ac M Merge remote-tracking branch 'origin/master' into CAS-14184 08 Feb 2024 CAS-14184 Srikrishna Sekhar 17dcee84afc CAS-14184 : Remove print statements in deconvolve 08 Feb 2024 CAS-14184 Srikrishna Sekhar 8f601cfc309 CAS-14184 : Fix to deconvolve return dict The task_deconvolve return dictionary did not contain "stopDescription"
for the niter=0 case. This commit fixes that issue. 08 Feb 2024 CAS-14184 Srikrishna Sekhar 9ed09e701eb CAS-14184 : Fixes to gclean tests + masking bugfix If a static user mask was provided in the input (e.g.,
circle[[50px,50px],10px]) the final mask-update deconvolve step was
breaking. It did not break for auto-masking or any other type of input
mask. This has been fixed by setting mask = '' in the last deconvolve
call, which still does the right thing for auto-masking etc.
Further, the default masking behaviour changed as of a few commits ago.... 06 Feb 2024 CAS-14184 Sandra Castro ee54dadb225 fixed typo in json entry. 06 Feb 2024 Sandra Castro 4efe43b2c2c Renamed test_task_gclean to test_imagerhelpers_gclean and moved it to the scripts directory. Added the new test script to the mapping json file to run automatically in Bamboo. 06 Feb 2024 Sandra Castro a0a4205bd45 Added main at the end of tests. Removed unused imports
Renamed class of test. 06 Feb 2024 Srikrishna Sekhar f6b7c80f4bf CAS-14184 : Bug fix for previous commit Forgot to remove a second line that had the wrong maskname. Also removed
extraneous print statements in gclean 01 Feb 2024 CAS-14184 Srikrishna Sekhar 50f6c9f8537 CAS-14184 : Fix for mask MTMFS naming convention The mask for MT-MFS is called "imagename.mask" not "imagename.mask.tt0". 01 Feb 2024 CAS-14184 Srikrishna Sekhar 53ab1f24ba5 CAS-14184 : Test for partial mask in gclean Added a unit test to check the use case of a single channel masked while
deconvolving a cube in gclean 31 Jan 2024 CAS-14184 Sandra Castro 0a45919b4a4 M Pull request #774: CAS-13714 Merge in CASA/casa6 from CAS-13714 to master
* commit '9bd7a74d61dfcdb3638178e26880df518f04c9be':
This commit is unrelated to the changes on this branch. They are changes needed for the verification tests when running tests that are not in the casatasks/tests/tasks/ path. I also sorted again some of the entries in the json file that were out of place.
Removed unused function prepinputmask.... 31 Jan 2024 CAS-13714 Srikrishna Sekhar 1f3998a5ff7 CAS-14184 : Fix for history logging If convergence was hit, the logger would repeatedly print out it's entire
history to the log. Issued a fix to account for that. 30 Jan 2024 CAS-14184 Srikrishna Sekhar 730b65e0308 CAS-14184 : Fix mask handling logic on startup The mask handling used to be in the frontend, but moved it to the
backend. It now correctly accounts for a restarted state with a
previously active mask.
The logic is :
- Initial launch : If usemask='user' and mask = '' then make sure the
default mask is filled with zeros before the GUI is launched. Leave mask
untouched for all other cases
- Restart :
- If usemask='user' and mask='' :
... 30 Jan 2024 CAS-14184 Srikrishna Sekhar 8efbcbc1ffd CAS-14184 : Fix typos in automasking params There were typos in the newly added automasking parameters that were
causing gclean to crash on startup. 30 Jan 2024 CAS-14184 Srikrishna Sekhar a3f52b7c17d CAS-14184 : Fixed masking params Some auto-multithresh parameters were missing from the _gclean input,
added those in.
The order of masking was also incorrect, the auto-mask growing was
happening _prior_ to deconvolution rather than after. This has also been
fixed. 29 Jan 2024 CAS-14184 Srikrishna Sekhar 3d8bd599cb1 CAS-14184 : More fixes to iteration control 29 Jan 2024 CAS-14184 Srikrishna Sekhar eca97e82ad9 CAS-14184 : Add check for user updated mask The user can update/change the mask in between major cycles. Previously
gclean was invoking `deconvolve` to do this, but now there is an
additional function that uses `imstat` to check if the peakresidual has
changed because of a mask update in between major cycles.
This has implications on whether to continue deconvolution or not, and
therefore needs to be done before deconvolve is called. 29 Jan 2024 CAS-14184 Ville Suoranta 0ea19da0cbb Update Casacore to f1c629840e 29 Jan 2024 Srikrishna Sekhar de3560ad489 CAS-14184 : Fix peakres calculation Added a check for masksum while calculating peakres across a cube. Only
in the case that masksum > 0 is peakres considered now.
This prevents the "bouncing" behaviour reported by Josh described below:
Iteration 1 :
field 0, chan 0, stokes 0, peakres [1.0149141550064087]
field 0, chan 1, stokes 0, peakres [5.736467361450195]
field 0, chan 2, stokes 0, peakres [4.154384136199951]
cyclethreshol... 27 Jan 2024 CAS-14184 Srikrishna Sekhar 9f8146167b4 CAS-14184 : Fixes for test failures There was a bug in how a non-existent mask was handled. This has now
been fixed. 27 Jan 2024 CAS-14184 Takeshi Nakazato 798ee8caa94 M Merge branch 'master' into CAS-14266 26 Jan 2024 CAS-14266 Srikrishna Sekhar 03739099c27 CAS-14184 : Bugfix for niter=0 peakres calculation If no mask was passed in for the niter=0 case, the `ImagingDict`
class set the `mask` parameter to -1 (instead of the pixel mask).
peakRes was always calcualted as `np.amax(image_pixels * mask_pixels)`
so when mask = -1 it picked the highest negative as the peakRes.
This commit fixes that bug, and has been confirmed to pass the
previously failing task_tclean tests.
Additionally, removed a che... 25 Jan 2024 CAS-14184 Sandra Castro 9bd7a74d61d This commit is unrelated to the changes on this branch. They are changes needed for the verification tests when running tests that are not in the casatasks/tests/tasks/ path. I also sorted again
some of the entries in the json file that were out of place. 24 Jan 2024 Ville Suoranta 2ad6b58ab24 M Pull request #773: CAS-14125 Merge in CASA/casa6 from CAS-14125 to master
* commit '84f7fac6687c36a544699c3c4d06fe9baa4998f6':
Use c++14 standard on all platforms
Add status messages
Require C++14 on Macs 24 Jan 2024 CAS-14125 Sandra Castro dd2622d7de2 Removed unused function prepinputmask. 19 Jan 2024 Ville Suoranta 0d4100fbafd Fix build.conf plotms 18 Jan 2024 Ville Suoranta 5fab491744c Update plotserver version 18 Jan 2024 Ville Suoranta 51eca46c178 Update build.conf to dev versions 18 Jan 2024 Srikrishna Sekhar ae625d22220 CAS-13901 : Fix asp tests in deconvolve tests Edited the passing thresholds for the asp tests in test_task_deconvolve.
Used a smalled gain value (gain=0.2) similar to test_task_tclean, and
the passing criterion are based on the values for a single major cycle
in test_task_tclean.
Also enabled asp testing on Darwin - with a lower gain it is expected to
be more stable across different systems. 16 Jan 2024 CAS-13901 Sandra Castro c6b60c4dead Removed casa5-related code from the tests. 16 Jan 2024 Takeshi Nakazato 2cbfe580ece CAS-14266 do not initialize UVWMachine for single-dish imaging 15 Jan 2024 CAS-14266 Takahiro Tsutsumi 6f83e42ed2a M Pull request #771: CAS-13705 Merge in CASA/casa6 from CAS-13705 to master
* commit '9483e883e5d389032b40e1139100991582c7315e': (31 commits)
add a commnet (mostly to retrigger the Bamboo build)
Update tests for the added overwrite parameter
Fixed a typo
Minor parameter description edit
Add overwrite parameter and check when overwrite=F
Edit on error message
A minor edit on the error message
Catch if there i... 13 Jan 2024 CAS-13705 Ville Suoranta a180c28a03d Update PlotMS in build.conf to 2.3.4a14231.dev6 12 Jan 2024 Ville Suoranta f392892c000 Trigger a build 12 Jan 2024 Ville Suoranta 9483e883e5d M Merge branch 'master' into CAS-13705 12 Jan 2024 CAS-13705 David Mehringer 632b7aa2fc8 M Pull request #772: CAS-14165 create getcalmodvla task Merge in CASA/casa6 from CAS-14165 to master
* commit 'db60838f8f784f9de5b7e8875f0da1edafda74f2': (53 commits)
use certifi to squash [SSL: CERTIFICATE_VERIFY_FAILED] issue
update declaration and summary generated by casadocs
remove renamed files
rename calmodvla -> getcalmodvla
updated task description generated by casadocs
calmod -> calmodvla name change
calmod -> calmodvla name... 12 Jan 2024 CAS-14165 Ville Suoranta 0ce5a528b4b M Merge remote-tracking branch 'origin/CAS-14213' into CAS-14089 11 Jan 2024 2 Jira issues