Ville Suoranta | e33296f79dfM | Merge branch 'master' into CAS-14069 | | CAS-14069 |
Ville Suoranta | b6011149b95Update casacore to c6c5513af42b0fd2aaa8d342e876ba1b05542b0a | Update casacore to c6c5513af42b0fd2aaa8d342e876ba1b05542b0a | | |
David Mehringer | 0b6f227d7bfM | Pull request #782: CAS-14235 new WS client task getantposalmaMerge in CASA/casa6 from CAS-14235 to master
* commit '3ca5b63d630430a4c0f97da661ee3e3f6b196db8': (37 commits)
doc corrections requested by akepley
tweak of output data structure
change output struct from list to dict
added "caltype" to metadata
fix up test
add json.loads() to write to a file something easier for gencal to handle. Requested by Enrique.
minor doc updates
new doc... | | CAS-14235 |
Takahiro Tsutsumi | ed483931080M | Pull request #781: CAS-13359Merge in CASA/casa6 from CAS-13359 to master
* commit '5c33a81582dbdaa21dea29ccb23df972dbfae96c':
Now usescratch's default is True in setjy, modified setjy command in test_model_keys to explicitly set usescatch=False
Add a test for the exception handling
Modify to use RuntimeError rather than generic Exception and the boolean comparison to follow PEP8
Minor edit to retrigger build
A ... | | CAS-13359 |
George Moellenbrock | 9595e18f176M | Pull request #779: CAS-13544Merge in CASA/casa6 from CAS-13544 to master
* commit '067003ae1f13325b61f64ccbd286adfbf761c9d9':
For CAS-13544, remove CRs in xml text that seem to mess up formatting in casadocs.
For CAS-13544, updated test_task_polfromgain.py to use proper symbolic link to input data in casatestdata (checked in by scastro this date); cleaned up polfromgain.xml to match corresponding changes in casadocs.... | | CAS-13544 |
David Mehringer | 3ca5b63d630 | doc corrections requested by akepley | | |
David Mehringer | 253db56ae74 | tweak of output data structure | | |
David Mehringer | 3006ac45e0c | change output struct from list to dict | | |
Ville Suoranta | 320ea757542M | Pull request #778: CAS-14093Merge 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.... | | CAS-14093 |
David Mehringer | c268bbb13f4 | added "caltype" to metadata | | |
David Mehringer | 5d92287e992 | fix up test | | |
David Mehringer | 75cdc73a5ac | add json.loads() to write to a file something easier for gencalto handle. Requested by Enrique. | | |
Takeshi Nakazato | 66bed521c76M | Pull request #777: CAS-14266Merge in CASA/casa6 from CAS-14266 to master
* commit '35aa5b675a4d465b976538cdcd112c1f70eb3772':
CAS-14266 do not initialize UVWMachine for single-dish imaging | | 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 | | |
Ville Suoranta | aa41bdeada3 | Update plotms in build.conf | | |
Ville Suoranta | 192ab305cd1M | Merge branch 'master' into CAS-14093 | | CAS-14093 |
David Mehringer | da4f80b3941 | minor doc updates | | |
Ville Suoranta | a24aff35f28M | Pull request #775: Update Casacore to f1c629840eMerge in CASA/casa6 from CAS-14274 to master
* commit '0ea19da0cbb2b20ba84125a4a91978e020429fdc':
Update Casacore to f1c629840e | | CAS-14274 |
Takeshi Nakazato | 35aa5b675a4M | Merge branch 'master' into CAS-14266 | | CAS-14266 |
David Mehringer | 8bee9ba3c37 | new doc updates | | |
David Mehringer | 9339dae883e | doc fix | | |
David Mehringer | e71238a4ce8M | Merge branch 'master' into CAS-14235 | | CAS-14235 |
Srikrishna Sekhar | 78334a52026M | Pull request #776: CAS-14184Merge 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... | | CAS-14184 |
Srikrishna Sekhar | 23ace523ef2 | CAS-14184 : Fix test to account for previous changeThe "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. | | CAS-14184 |
Srikrishna Sekhar | a467ec080acM | Merge remote-tracking branch 'origin/master' into CAS-14184 | | CAS-14184 |
Srikrishna Sekhar | 17dcee84afc | CAS-14184 : Remove print statements in deconvolve | | CAS-14184 |
Srikrishna Sekhar | 8f601cfc309 | CAS-14184 : Fix to deconvolve return dictThe task_deconvolve return dictionary did not contain "stopDescription"
for the niter=0 case. This commit fixes that issue. | | CAS-14184 |
Srikrishna Sekhar | 9ed09e701eb | CAS-14184 : Fixes to gclean tests + masking bugfixIf 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.... | | CAS-14184 |
Sandra Castro | ee54dadb225 | fixed typo in json entry. | | |
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. | | |
Sandra Castro | a0a4205bd45 | Added main at the end of tests.Removed unused imports
Renamed class of test. | | |
Srikrishna Sekhar | f6b7c80f4bf | CAS-14184 : Bug fix for previous commitForgot to remove a second line that had the wrong maskname. Also removed
extraneous print statements in gclean | | CAS-14184 |
Srikrishna Sekhar | 50f6c9f8537 | CAS-14184 : Fix for mask MTMFS naming conventionThe mask for MT-MFS is called "imagename.mask" not "imagename.mask.tt0". | | CAS-14184 |
Srikrishna Sekhar | 53ab1f24ba5 | CAS-14184 : Test for partial mask in gcleanAdded a unit test to check the use case of a single channel masked while
deconvolving a cube in gclean | | CAS-14184 |
Sandra Castro | 0a45919b4a4M | Pull request #774: CAS-13714Merge 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.... | | CAS-13714 |
Srikrishna Sekhar | 1f3998a5ff7 | CAS-14184 : Fix for history loggingIf convergence was hit, the logger would repeatedly print out it's entire
history to the log. Issued a fix to account for that. | | CAS-14184 |
Srikrishna Sekhar | 730b65e0308 | CAS-14184 : Fix mask handling logic on startupThe 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='' :
... | | CAS-14184 |
Srikrishna Sekhar | 8efbcbc1ffd | CAS-14184 : Fix typos in automasking paramsThere were typos in the newly added automasking parameters that were
causing gclean to crash on startup. | | CAS-14184 |
Srikrishna Sekhar | a3f52b7c17d | CAS-14184 : Fixed masking paramsSome 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. | | CAS-14184 |
Srikrishna Sekhar | 3d8bd599cb1 | CAS-14184 : More fixes to iteration control | | CAS-14184 |
Akeem Wells | 04c361bc1fb | Update component_to_test_map to add getantposalma | | |
Takahiro Tsutsumi | 5c33a81582d | Now usescratch's default is True in setjy, modified setjy command intest_model_keys to explicitly set usescatch=False | | |
Srikrishna Sekhar | eca97e82ad9 | CAS-14184 : Add check for user updated maskThe 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. | | CAS-14184 |
Ville Suoranta | 0ea19da0cbb | Update Casacore to f1c629840e | | |
Srikrishna Sekhar | de3560ad489 | CAS-14184 : Fix peakres calculationAdded 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... | | CAS-14184 |
Srikrishna Sekhar | 9f8146167b4 | CAS-14184 : Fixes for test failuresThere was a bug in how a non-existent mask was handled. This has now
been fixed. | | CAS-14184 |
Takahiro Tsutsumi | de151c17b09 | Add a test for the exception handling | | |
Takeshi Nakazato | 798ee8caa94M | Merge branch 'master' into CAS-14266 | | CAS-14266 |
Srikrishna Sekhar | 03739099c27 | CAS-14184 : Bugfix for niter=0 peakres calculationIf 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... | | CAS-14184 |
Takahiro Tsutsumi | 8471fd97d11 | Modify to use RuntimeError rather than generic Exception and the booleancomparison to follow PEP8 | | |