Srikrishna Sekhar 2363e285361 CAS-14283 : Allow calcres,calcpsf=False in first call
If calcres=False and calcpsf=False in the first call, the first major
cycle need not be run and we can go straight into deconvolution. Added
the conditional statements to support this use case in _gclean.py CAS-14283 : Allow calcres,calcpsf=False in first call If calcres=False and calcpsf=False in the first call, the first major
cycle need not be run and we can go straight into deconvolution. Added
the conditional statements to support this use case in _gclean.py 29 Jun 2024 CAS-14283 Srikrishna Sekhar de89f2e2955 CAS-14283 : Add automask params to gclean.__update gclean._update accepts automasking parameters. This follows a change in
casagui to add automasking parameters to the front end. 29 Jun 2024 CAS-14283 Darrell Schiebel 25f6982f129 the mask parameter of imstat is an LEL expression 21 Jun 2024 Darrell Schiebel 13655eefe8f fix typos [ CAS-14283 ] 06 May 2024 CAS-14283 Srikrishna Sekhar ed64fec8e6d CAS-14283 : Add missing tclean/deconvolve params Add the missing parameters into tclean + deconvolve. There are some
exceptions, detailed below.
As of this commit, the status is as follows.
"allowed" but non-functional (i.e., will not throw an error if passed
into run_iclean)
- calcpsf
- calcres
- restoration
not allowed (i.e., will throw an error)
- outlierfile
These will be fixed in future commits. 28 Mar 2024 CAS-14283 Darrell Schiebel 2f1bdf9f2d3 fix needed for OLD build system due to setuptools update [ CAS-14283 ] 27 Mar 2024 CAS-14283 Srikrishna Sekhar 356192c5978 CAS-14283 : Add nsigma and threshold to gclean.update The interactive clean GUI now exposes the threshold and nsigma
parameters as user-configurable. gclean.update has been updated to
reflect this change, including some basic sanity checks on the
user-input values. 23 Feb 2024 CAS-14283 Srikrishna Sekhar a107df5b65a CAS-14283 : Add __del__ to _gclean.py Added __del__ method to _gclean.py, which does the restoration step (if
not already run) when the generator terminates.
This allows for more graceful termination of gclean, and leaves a
"finished" image on disk, rather than only the residual and model
images. 15 Feb 2024 CAS-14283 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 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 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 Sandra Castro c6b60c4dead Removed casa5-related code from the tests. 16 Jan 2024 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 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 84f7fac6687 M Merge branch 'master' into CAS-14125 10 Jan 2024 CAS-14125 George Moellenbrock 326629aeabf M Pull request #770: CAS-14219 Merge in CASA/casa6 from CAS-14219 to master
* commit '7334dd27c6038c278b21b700840c940e8f564478':
For CAS-14219 , explicitly import measures (me) tool so it works in modular casa6; added revision description
For CAS-14219 , some further minor refinements to the script and tests.
For CAS-14219 , update formation of IGS filename to match the new CDDIS convention (including for rapid product f... 10 Jan 2024 3 Jira issuesTakahiro Tsutsumi b6a3f36c9dc M Merge branch 'master' into CAS-13705 09 Jan 2024 CAS-13705 David Mehringer db60838f8f7 use certifi to squash [SSL: CERTIFICATE_VERIFY_FAILED] issue 09 Jan 2024 George Moellenbrock 7334dd27c60 M Merge branch 'master' into CAS-14219 09 Jan 2024 CAS-14219 Takeshi Nakazato 8af308c8fe8 M Pull request #769: CAS-13087 Merge in CASA/casa6 from CAS-13087 to master
* commit 'e8d234d102b04e2a124f23c0e0af820bf72f978e': (51 commits)
CAS-13087 cleanup tentative code
Minor bug fix on test code
CAS-13087 fix problem in ms conformance tests
CAS-13087 more refactoring
CAS-13087 additional modofication for merging master into this branch
Revert "Merge branch 'master' into CAS-13087 "
Merge branch 'master' ... 09 Jan 2024 CAS-13087 Srikrishna Sekhar 01c05a91e50 CAS-14184 : Fix cyclefactor param check Any value > 0 is valid for cyclefactor, but previously the parameter
check would insist that cyclefactor > 1. 08 Jan 2024 CAS-14184 Ville Suoranta 07df7e213c0 M Pull request #768: Do not filter warnings in task_plotbandpass.py Merge in CASA/casa6 from CAS-14224 to master
* commit '04f05a69f407fc5014c2c7fd310a91f4de061672':
Do not filter warnings in task_plotbandpass.py 08 Jan 2024 CAS-14224 Srikrishna Sekhar 643fe56a886 M Pull request #767: CAS-13791 Merge in CASA/casa6 from CAS-13791 to master
* commit '0b3b01d988822e881a47dbb8a9138d5622ebfae6':
CAS-13791 : Modified tests to have gain=0.2. This reduces variability across build systems to below the standard tolerance threshold. Enabled the test for Mac too.
CAS-13791 : edited the ver test func for asp
CAS-13791 : Set 'fusedthreshold = -1' to allow AspClean never switches to Hogbom. T... 08 Jan 2024 3 Jira issuesTakahiro Tsutsumi 72da40aa9e5 add a commnet (mostly to retrigger the Bamboo build) 06 Jan 2024 Takahiro Tsutsumi 9335d9ea35c Update tests for the added overwrite parameter 06 Jan 2024