Build: #2 was successful Changes by Pam Harris <pharris@nrao.edu>
Code commits
casa6
-
Pam Harris <pharris@nrao.edu> e62c959ec065f26e98dc6a4a99ec3f403ae8e9bc
Merge branch 'master' into CAS-14276
-
David Mehringer 0b6f227d7bf926ae4f1d9aa5a0cb3ab744924fb5 m
Pull request #782: CAS-14235 new WS client task getantposalma
Merge 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 updates
doc fix
Update component_to_test_map to add getantposalma
add metaata to output file as python dict
check point
check point
change default server to prod server, update tests so they all pass
finish renaming task
rename antposalma -> getantposalma
check point
rename
remove obsolete files, add test area for antposalma
attempt to figure out when to use prod server vs dev server
... -
Takahiro Tsutsumi ed4839310801d2afe38c79d34e674760f1292e95 m
Pull request #781: CAS-13359
Merge 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 minor edit in the xml help doc
Change the default for usescratch to True. Catch to raise an exception when Butler-JPL-Horizons and usescratch = False are set. -
George Moellenbrock 9595e18f176bbe305257ba48a8c9cd48b056b8be m
Pull request #779: CAS-13544
Merge 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.
For CAS-13544, further refinements to polfromgain task; complete revision of test_task_polfromgain.py
For CAS-13544: improved handling of parang cycles in discerning available parang range; temporarily disabled some unit tests pending updates
For CAS-13544, in polfromgain task, trapped insufficient parallactic angle coverage (via new minpacov parameter) to avoid implausible results, including a negative gain ratio that causes a 'math domain error' and failure of the task to complete. -
David Mehringer 3ca5b63d630430a4c0f97da661ee3e3f6b196db8 m
doc corrections requested by akepley
-
David Mehringer 253db56ae747679fdda3af7ea4c679121a9812eb m
tweak of output data structure
-
David Mehringer 3006ac45e0cbac8d4d24cfa9d6e662abd31986fe m
change output struct from list to dict
-
Ville Suoranta 320ea757542ecd9eb1e6e8ad25009da79a155579 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.3.4a14231.dev6
Trigger a build
Compare float values with tolerances rather than exact values.
Restore casaviewer in build.conf
Restore almatasks in build.conf
Add build.conf with arm packages
Remove failed arch attempts
Revert "Revert "Test -arch arm64""
Revert "Revert "Try arm64 as a swig compile option""
Revert "Allow single element Java version number"
Revert "Add defition CMAKE_OSX_ARCHITECTURES=arm64"
Revert "Try running Java with arch -arm64"
Revert "Fix previous commit"
Revert "Fix mod-closure"
Fix mod-closure
... -
David Mehringer c268bbb13f43c952ecdfe3f663c8cf23f37b1d40 m
added "caltype" to metadata
-
David Mehringer 5d92287e99205d4c31dfe00567dc6f1e71ed7a0a m
fix up test
-
David Mehringer 75cdc73a5ac4c7af9487424c1fb3c33a775cfef6 m
add json.loads() to write to a file something easier for gencal to handle. Requested by Enrique.
-
Takeshi Nakazato 66bed521c7693786d372cd31d3f0fd7973b23473 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 -
Ville Suoranta 19913d87ffc730f6fa3dc4b4f9f32a663004e698 m
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 aa41bdeada34abe6abd5e6bd2eecf2ed8bde13d8 m
Update plotms in build.conf
-
Ville Suoranta 192ab305cd10d39ec1ec6e806a250ea65d8dcf7a m
Merge branch 'master' into CAS-14093
-
David Mehringer da4f80b39414f165c67d85d1d23bb5898bf9ba94 m
minor doc updates
-
Ville Suoranta a24aff35f28f2061f31a1f8f669900acd7ea55d3 m
Pull request #775: Update Casacore to f1c629840e
Merge in CASA/casa6 from CAS-14274 to master
* commit '0ea19da0cbb2b20ba84125a4a91978e020429fdc':
Update Casacore to f1c629840e -
Takeshi Nakazato 35aa5b675a4d465b976538cdcd112c1f70eb3772 m
Merge branch 'master' into CAS-14266
-
David Mehringer 8bee9ba3c37c5edf63a676bd12c987b5567874de m
new doc updates
-
David Mehringer 9339dae883e19ae236ae3ceae463c25408f65726 m
doc fix
-
David Mehringer e71238a4ce8e75e611ebe81537470bbc5a7958d7 m
Merge branch 'master' into CAS-14235
-
Srikrishna Sekhar 78334a52026c0c1d7851138cb0994cef9978b41d 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_gclean and moved it to the scripts directory. Added the new test script to the mapping json file to run automatically in Bamboo.
Added main at the end of tests. Removed unused imports Renamed class of test.
CAS-14184 : Bug fix for previous commit
CAS-14184 : Fix for mask MTMFS naming convention
CAS-14184 : Test for partial mask in gclean
CAS-14184 : Fix for history logging
CAS-14184 : Fix mask handling logic on startup
CAS-14184 : Fix typos in automasking params
CAS-14184 : Fixed masking params
CAS-14184 : More fixes to iteration control
CAS-14184 : Add check for user updated mask
CAS-14184 : Fix peakres calculation
CAS-14184 : Fixes for test failures
CAS-14184 : Bugfix for niter=0 peakres calculation
CAS-14184 : Fix cyclefactor param check
... -
Srikrishna Sekhar 23ace523ef21f0c5a04b5bd5f527a147712e0274 m
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. -
Srikrishna Sekhar a467ec080acdb61d659987fbe6e0753ee45a53aa m
Merge remote-tracking branch 'origin/master' into CAS-14184
-
Srikrishna Sekhar 17dcee84afc4faca43b8b41e7aab19691df4289e m
CAS-14184 : Remove print statements in deconvolve
-
Srikrishna Sekhar 8f601cfc309e7f73966f090414c2ed60d546ab12 m
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. -
Srikrishna Sekhar 9ed09e701eb853bbf889175a6ecd0e461c727551 m
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.
This was not reflected in the test cases, so they were all failing. The
tests have been updated to reflect this new behaviour as well. -
Sandra Castro ee54dadb2253e44ecff8d63cea658fe4bee68378 m
fixed typo in json entry.
-
Sandra Castro 4efe43b2c2c674172d60e978131877341ee8699d m
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 a0a4205bd456371e0e0c453561c0ade49eb211b0 m
Added main at the end of tests. Removed unused imports Renamed class of test.
-
Srikrishna Sekhar f6b7c80f4bfc7907d9bc95d0c9d6fd35a2d80c68 m
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 -
Srikrishna Sekhar 50f6c9f8537719edab072fad4f639334fdce46e7 m
CAS-14184 : Fix for mask MTMFS naming convention
The mask for MT-MFS is called "imagename.mask" not "imagename.mask.tt0". -
Srikrishna Sekhar 53ab1f24ba528e45569bad98c99790b6ad3ae149 m
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 -
Srikrishna Sekhar 1f3998a5ff73643fb1fc9ade1ce1f9a4917b9655 m
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. -
Srikrishna Sekhar 730b65e03080d7411bacd914fef0d8b6e0e6e95b m
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='' :
- If mask exists on disk - leave untouched
- If mask does not exist, make sure mask is filled with zeros
- Leave mask untouched for all other cases -
Srikrishna Sekhar 8efbcbc1ffda9b409d0e4a2831706e4e7e6ac01b m
CAS-14184 : Fix typos in automasking params
There were typos in the newly added automasking parameters that were
causing gclean to crash on startup. -
Srikrishna Sekhar a3f52b7c17da4127698d0d7d974bd865aeb50db5 m
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. -
Srikrishna Sekhar 3d8bd599cb1f4760840c16eb488519ab4115db7d m
CAS-14184 : More fixes to iteration control
-
Akeem Wells 04c361bc1fbb801e3e0c30df59c8ac32b18fb8c9 m
Update component_to_test_map to add getantposalma
-
Takahiro Tsutsumi 5c33a81582dbdaa21dea29ccb23df972dbfae96c m
Now usescratch's default is True in setjy, modified setjy command in test_model_keys to explicitly set usescatch=False
-
Srikrishna Sekhar eca97e82ad9bd49865c951c595935bfe3e5ce4b8 m
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. -
Ville Suoranta 0ea19da0cbb2b20ba84125a4a91978e020429fdc m
Update Casacore to f1c629840e
-
Srikrishna Sekhar de3560ad489ff41074dfc91879749d16c589b824 m
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]
cyclethreshold = 1.0222507446548832
Above the cycle threshold is determined by the global peak value (5.736)
and chan 0 is cleaned down until the threshold. It returns to the GUI
and we click again, nothing happens because we are in convergence. But
peakres still gets updated as below.
Iteration 2 (after convergence)
field 0, chan 0, stokes 0, peakres [1.0149141550064087, 1.014911413192749]
field 0, chan 1, stokes 0, peakres [5.736467361450195, -0.0]
field 0, chan 2, stokes 0, peakres [4.154384136199951, 0.0]
cyclethreshold=0.18085938305290838
Here we have hit convergence, we take the niter=0 path in deconvolve and
set peakres=0 for channels with no mask. Now cyclethreshold is
determined by the residual in the first channel, and drops. But since we
are in the niter=0 path no deconvolution happens.
Iteration 3 :
field 0, chan 0, stokes 0, peakres [1.0149141550064087, 1.014911413192749, 0.6902092099189758]
field 0, chan 1, stokes 0, peakres [5.736467361450195, -0.0, 5.736467361450195]
field 0, chan 2, stokes 0, peakres [4.154384136199951, 0.0, 4.154384136199951]
cyclethreshold = 1.0222507446548832
We end up doing more deconvolution based on the previous cyclethreshold,
and now once again the new cyclethreshold is determined by the global
peak (5.736) and is too high to continue deconvolution. -
Srikrishna Sekhar 9f8146167b40abf769099d49001e6a9023fbe182 m
CAS-14184 : Fixes for test failures
There was a bug in how a non-existent mask was handled. This has now
been fixed. -
Takahiro Tsutsumi de151c17b096a6cca7b124c9276b791e8508c6de m
Add a test for the exception handling
-
Takeshi Nakazato 798ee8caa94bceea79c81f92f861f33511707835 m
Merge branch 'master' into CAS-14266
-
Srikrishna Sekhar 03739099c27bf0e680281760efb1afac3d8d1800 m
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 check in test_task_tclean that asserted
len(summaryminor) == 0 for niter = 0. -
Takahiro Tsutsumi 8471fd97d111872a616153dea228ffdda342bc48 m
Modify to use RuntimeError rather than generic Exception and the boolean comparison to follow PEP8
-
Takahiro Tsutsumi 9b33b782bf7b88f5838db18251c367e8d5e6fffb m
Merge branch 'master' into CAS-13359
-
David Mehringer 9715d52dea334c361d8caf417023d9f3bac88399 m
Merge branch 'master' into CAS-14235
-
Ville Suoranta 0d4100fbafd40a5aedc0ee4196179abd6db382a2 m
Fix build.conf plotms
-
Ville Suoranta 5fab491744c85220b289808c5d465daeb97d0ff6 m
Update plotserver version
-
Ville Suoranta 51eca46c178e8f3a9416a02d0872f05cb73c2c4e m
Update build.conf to dev versions
-
Takeshi Nakazato 2cbfe580ecece5e380cbfdbcd6524ab355a659a9 m
CAS-14266 do not initialize UVWMachine for single-dish imaging
- casatools/src/code/synthesis/TransformMachines2/FTMachine.cc (version 2cbfe580ecece5e380cbfdbcd6524ab355a659a9) (diffs)
- casatools/src/code/synthesis/TransformMachines2/FTMachine.h (version 2cbfe580ecece5e380cbfdbcd6524ab355a659a9) (diffs)
- casatools/src/code/synthesis/TransformMachines2/SDGrid.cc (version 2cbfe580ecece5e380cbfdbcd6524ab355a659a9) (diffs)
- casatools/src/code/synthesis/TransformMachines2/SDGrid.h (version 2cbfe580ecece5e380cbfdbcd6524ab355a659a9) (diffs)
-
David Mehringer 5e26f6348ed165c04304793c3980edf5f39859dd m
add metaata to output file as python dict
-
Ville Suoranta a180c28a03d5073e5f6982c690ed7fb087daee6e m
Update PlotMS in build.conf to 2.3.4a14231.dev6
-
Ville Suoranta f392892c000e94e1d4adc58ae87cc184ccb43178 m
Trigger a build
-
David Mehringer a2f34fefa63256ec027c01c3ca92c878e57cdce4 m
check point
-
David Mehringer e793c56e05f79c54e55ab9679c23e493daf9fce6 m
check point
-
Ville Suoranta 0ce5a528b4b54e8236d5e09d48b509078ccb2e23 m
Merge remote-tracking branch 'origin/CAS-14213' into CAS-14089
-
C. Enrique Garcia Dabo 4c976195c386fec73bef33e63171f70ecc5e58fd m
Compare float values with tolerances rather than exact values.
Fixes CAS-14213 -
David Mehringer 842e04281364deee1616a366ad3295012647d4ee m
Merge branch 'master' into CAS-14235
-
Srikrishna Sekhar 01c05a91e503376f7282a43f662f5633ca5a72ab m
CAS-14184 : Fix cyclefactor param check
Any value > 0 is valid for cyclefactor, but previously the parameter
check would insist that cyclefactor > 1. -
David Mehringer 95f53b8ed9406ae8d37f66f7f0ddc353a8f8510a m
change default server to prod server, update tests so they all pass
- casatasks/src/private/task_getantposalma.py (version 95f53b8ed9406ae8d37f66f7f0ddc353a8f8510a) (diffs)
- casatasks/tests/tasks/test_task_getantposalma.py (version 95f53b8ed9406ae8d37f66f7f0ddc353a8f8510a) (diffs)
- casatasks/xml/getantposalma.xml (version 95f53b8ed9406ae8d37f66f7f0ddc353a8f8510a) (diffs)
-
David Mehringer 325ed911ad4731e7c66613f7ef9407746b4cf04a m
finish renaming task
- casatasks/readme.md (version 325ed911ad4731e7c66613f7ef9407746b4cf04a) (diffs)
- casatasks/setup.py (version 325ed911ad4731e7c66613f7ef9407746b4cf04a) (diffs)
- casatasks/src/private/task_getantposalma.py (version 325ed911ad4731e7c66613f7ef9407746b4cf04a) (diffs)
- casatasks/tests/tasks/test_task_getantposalma.py (version 325ed911ad4731e7c66613f7ef9407746b4cf04a) (diffs)
- casatasks/xml/getantposalma.xml (version 325ed911ad4731e7c66613f7ef9407746b4cf04a) (diffs)
-
David Mehringer eb95d0510b8057ca6dc709b151829bacdedd6e3b m
rename antposalma -> getantposalma
- casatasks/src/private/task_getantposalma.py (version eb95d0510b8057ca6dc709b151829bacdedd6e3b) (diffs)
- casatasks/tests/tasks/test_task_getantposalma.py (version eb95d0510b8057ca6dc709b151829bacdedd6e3b) (diffs)
- casatasks/xml/getantposalma.xml (version eb95d0510b8057ca6dc709b151829bacdedd6e3b) (diffs)
- casatestutils/casatestutils/getantposalma_helpers/__init__.py (version eb95d0510b8057ca6dc709b151829bacdedd6e3b) (diffs)
- casatestutils/casatestutils/getantposalma_helpers/query1.json (version eb95d0510b8057ca6dc709b151829bacdedd6e3b) (diffs)
-
David Mehringer a76c4a5607131249e0ef8a51e3ceca12470bcdd6 m
Merge branch 'master' into CAS-14235
-
Srikrishna Sekhar 9e5d0d6e7f3d7db37740c7b05d34dde8f89bb5c5 m
CAS-14184 : More fixes for parameter checking
There was a bug checking the threshold value, where the incorrect value
is actually set internally prior to being checked. While this does not
affect interactive functionality, non-interactive tests were failing.
cyclefactor was being tested as an integer, but really it can be a
floating point value. This has been fixed as well. -
Srikrishna Sekhar 457953aacff9ef63c9c73db0ba2a503b147031ff m
CAS-14184 : More fixes to parameter checking
Parameter checking is no longer in a function, but rather just inside
gclean.update. There are two reasons for this :
(a) The parameters that come into __init__ already get verified in
interactiveclean, so we don't need to do an additional check at the end.
That leaves the only place to check parameters in gclean.update
(b) In order for the function to work, the internal variables (like
self._niter, self._nmajor etc.) will take on the incorrect value and
then only be checked. Which is not ideal, since we want to prevent these
variables from ever getting to an incorrect state.
The current code does error checking in-situ, so the variables never
enter an incorrect state, but will rather throw and error and go back to
the user to fix things. -
David Mehringer b2ad643370dc15ebedd15fa621cc34c9854842b9 m
check point
-
David Mehringer 587e9b99c794a511d97de6dc5764f5bd2f3fa859 m
rename
-
David Mehringer 07b769504db5d2365c2092dc13d93982e74879cf m
remove obsolete files, add test area for antposalma
- casatasks/src/private/task_antpos.py (version 07b769504db5d2365c2092dc13d93982e74879cf) (diffs)
- casatasks/tests/tasks/test_task_antpos.py (version 07b769504db5d2365c2092dc13d93982e74879cf) (diffs)
- casatasks/xml/antpos.xml (version 07b769504db5d2365c2092dc13d93982e74879cf) (diffs)
- casatestutils/casatestutils/antposalma/__init__.py (version 07b769504db5d2365c2092dc13d93982e74879cf) (diffs)
-
David Mehringer 1d13b5acbc17edcc0cd9a646e768fda799d96050 m
attempt to figure out when to use prod server vs dev server
-
David Mehringer c48708f11af1ea727c1a01e473d31104741de3b8 m
minor updates
-
David Mehringer 96e65300639130e439915b927e21f30e2387aede m
name change antpos -> antposalma
- casatasks/readme.md (version 96e65300639130e439915b927e21f30e2387aede) (diffs)
- casatasks/setup.py (version 96e65300639130e439915b927e21f30e2387aede) (diffs)
- casatasks/src/private/task_antposalma.py (version 96e65300639130e439915b927e21f30e2387aede) (diffs)
- casatasks/tests/tasks/test_task_antposalma.py (version 96e65300639130e439915b927e21f30e2387aede) (diffs)
- casatasks/xml/antposalma.xml (version 96e65300639130e439915b927e21f30e2387aede) (diffs)
-
Srikrishna Sekhar 66e17f166f46affe4e0a21ffad67a9425a0f686f m
CAS-14184 : Bug fix to param checking
Fixed issue with parameter checking not doing the right thing - now if
the wrong param is sent into `gclean.update` it actually returns the
right exit code. -
Srikrishna Sekhar 3e186222b979bf8be3b8a7f2e604216599859296 m
CAS-14184 : Fix bug with parameter validation
Added a `return` statement in `gclean.update` so the parameter
validation goes through to the GUI.
`__init__` now raises a ValueError if the parameter validation fails. -
Srikrishna Sekhar ee8080438b76c0125e99c7a9c80f5e8c3cf92d57 m
CAS-14184 : Add parameter checking to gclean
The iteration control parameters (nmajor, niter etc.) that get passed in
via the GUI are currently being checked in casagui.interactiveclean.
This check should happen inside gclean.
The check makes sure that the iteration control params are of the right
type (int, float etc.) and have values that are in an allowable range
(i.e., niter = -100 is not allowed)
This check happens both during initialization of gclean (inside
__init__) as well as in the update() function when new parameters come
in via the GUI. -
David Mehringer 469086424052b96b81f0019c4e572f7fdf69e026 m
Merge branch 'master' into CAS-14235
-
Srikrishna Sekhar c8067df89a059ea966886125e6ec843dc9f66325 m
CAS-14184: Modify get_summaryminor_stopdesc
If no `stopcode` is passed in, it returns the entire dictionary. The
function is also now a @staticmethod so the class does not need to be
instantiated in order to call the function. -
Srikrishna Sekhar c4a906c0bb9de727d68986d564286492e132b139 m
CAS-14184 : Add summaryminor stopdesc retreival
Added a function that returns the summaryminor stop description given
the input summaryminor stopcode. This is to prevent carrying the
additional string in the dictionary returned by `gclean`.
This function lives inside the ImagingDict() class. -
Srikrishna Sekhar 7cb68583ca75a671d627b2d60247f79954601bfd m
CAS-14184 : Add verification tests
Added test_task_gclean (for now) that tests gclean in various usage
modes.
This test suite lives outside test_task_tclean and test_task_deconvolve
because it uses a combination of both tasks. -
Takahiro Tsutsumi c5c562abe56990b4d8506be03d6e77b0d7b01782 m
Merge branch 'master' into CAS-13359
-
Urvashi R._V <rurvashi@aoc.nrao.edu> b196061b932ce7b6d1c1d53231ab5a116e36e081 m
CAS-14148 : removed mask_changed
-
Urvashi R._V <rurvashi@aoc.nrao.edu> 58daecd1ba480a2525b744c2661372d360bbaa4d m
CAS-14148 : handling zero mask case some more
-
Urvashi R._V <rurvashi@aoc.nrao.edu> e2b2299e0d7876e29604d07f3f54b48da9a50847 m
CAS-14184 : More changes for iteration control
-
Srikrishna Sekhar c1d3a881803b15a6a0ba972a0241fe1d48080c41 m
CAS-14184 : Bugfix when niter==0
The inital call to _convergence_result when niter < 1 was returning
`self._convergence_result[3]` rather than `self._convergence_result[5]`.
In the last few commits _convergence_results when from a 4-tuple to a
6-tuple and so this needed to be changed accordingly. -
Srikrishna Sekhar 846585ebdb97573a704123b297208fc0e21d472b m
CAS-14184 : Add try/except catch in __next__
Wrapped the bulk of the __next__ function inside a `try/except` in order
to catch any exceptions thrown by tclean/deconvolve.
The error traceback is caught and is passed back as the stopdescription,
with an accompanying stopcode of -1 -
Srikrishna Sekhar 1183d826971e7c1d103d7537374bd543963f4fb3 m
CAS-14184 : min_peakres calculation ignores zeros
Checking for divergence via current_peakres > 3*min_peakres now ignores
a peak_residual of 0, since the only way to achieve that is with a fully
masked image. The minimum residual is now calculated ignoring any
values that are zero. -
Ville Suoranta 6699112750d764b966470d6ea14a4d5a4014d260 m
Restore casaviewer in build.conf
-
Srikrishna Sekhar 76b3ccb537762664d274ddfbe4ca1e0ffa53ffa5 m
CAS-14184 : Fixed typo in _gclean.py
self._mask_changed did not have a leading _ in the _init function. -
Ville Suoranta 5c8fa4f54d1a77ac09dc621c564a7f827af6dbc6 m
Restore almatasks in build.conf
-
Urvashi R._V <rurvashi@aoc.nrao.edu> 4a3195204565421ab8ecdb827eb167ff59d7c5ed m
CAS-14184 : passed global threshold to has_converged + added a way for the GUI to tell gclean that the mask has changed.
-
Urvashi R._V <rurvashi@aoc.nrao.edu> 3e54154f9133244c442531cf043321f80ac900c9 m
CAS-14184 : fix for zero mask stopping criterion
-
Urvashi R._V <rurvashi@aoc.nrao.edu> 3a82f48668c78033c785d3c1c958e264f21b81fa m
CAS-14184 : fixed deconvolve ret dir empty summaryminor, added zero floor for niter in _gclean
- casatasks/src/private/imagerhelpers/_gclean.py (version 3a82f48668c78033c785d3c1c958e264f21b81fa) (diffs)
- casatasks/src/private/imagerhelpers/imager_return_dict.py (version 3a82f48668c78033c785d3c1c958e264f21b81fa) (diffs)
- casatasks/src/private/task_deconvolve.py (version 3a82f48668c78033c785d3c1c958e264f21b81fa) (diffs)
-
Ville Suoranta 3caff9703cd1c7b614d55edf458dbea0ca313075 m
Merge branch 'master' into CAS-14089
-
Srikrishna Sekhar 8fc5aa6763835ed49863eab6397ce4e93ba9aa8f m
Merge remote-tracking branch 'origin/master' into CAS-14184
-
Srikrishna Sekhar ead1544c7c0e6c8a3cad70b59acb402233179024 m
CAS-14184 : Replace _nmajorleft with _nmajor
And similarly for _niterleft with _niter. -
Srikrishna Sekhar 51194c8eb79dc859107afdbd9e83d6766bee1191 m
CAS-14184 : tclean(niter=0) now contains threshold
The threshold keyword is correctly populated in the return dict for the
tclean(niter=0) case. -
Srikrishna Sekhar d363e411f08bd3cb26752ca675634e224f05f8c5 m
CAS-14184 : Fix threshold during dict merge
ImagingDict.merge() was not preserving the user-defined threshold correctly
because tclean(niter=0) did not populate the threshold key correctly whereas
deconvolve(niter > 0) does. merge() previously preferred the tclean `threshold`
key over `deconvolve`, leading to the bug where a threshold based stopping
criterion was not respected. This has now been fixed.