Casa6

• 

  Takahiro Tsutsumi 20 Jan 2023 fb8c08a998d4d8e3ec8f4887a6d96ba7fcc8fdd7

  Pull request #666: CAS-13924
  Merge in CASA/casa6 from CAS-13924 to master
  
  * commit '775f0f2e5c206bc19cc59ed2695ab2134fd8e67e': (34 commits)
    Benign edits in the comment lines to re-trigger build
    Increment the casampi version
    Add the initialization of InteractiveIterDone
    Change test_iterbot_nmajor_2 to use fullsummary=True
    Change fullsummary default to False
    Remove a debugging statement
    Removed startIterDone check for fullsummary=True test as the value varies with the number of nodes used
    Make storage of minor cycle iterDone non-cumulative across chan. and stokes for all cases
    Update the iterDone test
    Fix for the inconsistent behavior of summary_minor iterDone
    Fixed a typo
    Change the way import casampi in summry_minor so that it does not raise an exception when the module is not available
    Tweaked iterbot tests to test return dictionary values properly taking account for the current differeces in summaryminor iterDone behavior between mpicasa (cummulative) and serial(non-cummulative).
    Add zero iteration cases in the return dictionary check
    Additional tests for deconvolve
    Add new tests for fullsummary. Add a new test helper function, check_ret_structure and call to this function from checkall when 'ret' argument is specified.
    Futher edit and change the sdintimaging and deconvolve tasks' fullsummary default to True to match with tclean's
    The fullsummary parameter description rewording based on the feedback during the code review
    Add new tests for fullsummary parameter for cube and mfs. Add a new test helper function, check_ret_structure to check conformance of the return dictionary.
    Remove a debug statement
    ...
• 

  Takahiro Tsutsumi 18 Jan 2023 775f0f2e5c206bc19cc59ed2695ab2134fd8e67e m

  Benign edits in the comment lines to re-trigger build

  • casatasks/tests/tasks/test_task_tclean.py (version 775f0f2e5c206bc19cc59ed2695ab2134fd8e67e) (diffs)
• 

  Takahiro Tsutsumi 18 Jan 2023 adbb602fd6e927ecd72166a03bd77da1f3dcde76 m

  Increment the casampi version

  • build.conf (version adbb602fd6e927ecd72166a03bd77da1f3dcde76) (diffs)
• 

  Takahiro Tsutsumi 13 Jan 2023 6ca8dd82cf6abe504fbb30e4fa6102f34d95b446 m

  Add the initialization of InteractiveIterDone

  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version 6ca8dd82cf6abe504fbb30e4fa6102f34d95b446) (diffs)
• 

  Takahiro Tsutsumi 05 Jan 2023 2e8ffcb44a629fd6d8d10406d7ea6d3b933e64af m

  Change test_iterbot_nmajor_2 to use fullsummary=True

  • casatasks/tests/tasks/test_task_tclean.py (version 2e8ffcb44a629fd6d8d10406d7ea6d3b933e64af) (diffs)
• 

  Takahiro Tsutsumi 05 Jan 2023 7c11f43ef4136e764355217f415a51bd30b92500 m

  Change fullsummary default to False

  • casatasks/xml/deconvolve.xml (version 7c11f43ef4136e764355217f415a51bd30b92500) (diffs)
  • casatasks/xml/sdintimaging.xml (version 7c11f43ef4136e764355217f415a51bd30b92500) (diffs)
  • casatasks/xml/tclean.xml (version 7c11f43ef4136e764355217f415a51bd30b92500) (diffs)
• 

  Takahiro Tsutsumi 03 Jan 2023 4df9122340184fcab2e54b06684e78bb3e454bfa m

  Remove a debugging statement

  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version 4df9122340184fcab2e54b06684e78bb3e454bfa) (diffs)
• 

  Takahiro Tsutsumi 15 Dec 2022 10cda619c62e50c3a9fcb34646887e4b75f668b5 m

  Removed startIterDone check for fullsummary=True test as the value varies with the number of nodes used

  • casatasks/tests/tasks/test_task_deconvolve.py (version 10cda619c62e50c3a9fcb34646887e4b75f668b5) (diffs)
• 

  Takahiro Tsutsumi 07 Dec 2022 7a3f63e09251df0a105540526e5811ca99ebce51 m

  Make storage of minor cycle iterDone non-cumulative across chan. and stokes for all cases

  • casatasks/src/private/imagerhelpers/summary_minor.py (version 7a3f63e09251df0a105540526e5811ca99ebce51) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version 7a3f63e09251df0a105540526e5811ca99ebce51) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version 7a3f63e09251df0a105540526e5811ca99ebce51) (diffs)
• 

  Takahiro Tsutsumi 06 Dec 2022 f622e0b6c90024404486ff2fd8197dd09986d35f m

  Update the iterDone test

  • casatasks/tests/tasks/test_task_deconvolve.py (version f622e0b6c90024404486ff2fd8197dd09986d35f) (diffs)
• 

  Takahiro Tsutsumi 06 Dec 2022 f6052528efbba9d02494f31a915af96d8a668cbd m

  Fix for the inconsistent behavior of summary_minor iterDone

  • casatasks/tests/tasks/test_task_tclean.py (version f6052528efbba9d02494f31a915af96d8a668cbd) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version f6052528efbba9d02494f31a915af96d8a668cbd) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version f6052528efbba9d02494f31a915af96d8a668cbd) (diffs)
• 

  Takahiro Tsutsumi 30 Nov 2022 0a7f89170f59719882819fc41911d915ba579eb2 m

  Fixed a typo

  • casatasks/src/private/imagerhelpers/summary_minor.py (version 0a7f89170f59719882819fc41911d915ba579eb2) (diffs)
• 

  Takahiro Tsutsumi 30 Nov 2022 d5a232c90f67d1c1e675f2cdd7c66928b4caf785 m

  Change the way import casampi in summry_minor so that it does not raise an exception when the module is not available

  • casatasks/src/private/imagerhelpers/summary_minor.py (version d5a232c90f67d1c1e675f2cdd7c66928b4caf785) (diffs)
• 

  Takahiro Tsutsumi 28 Nov 2022 3030a25454c0910987dbe8dcd32953a4c938bdeb m

  Tweaked iterbot tests to test return dictionary values properly taking account for the current differeces in summaryminor iterDone behavior between mpicasa (cummulative) and serial(non-cummulative).

  • casatasks/tests/tasks/test_task_tclean.py (version 3030a25454c0910987dbe8dcd32953a4c938bdeb) (diffs)
• 

  Takahiro Tsutsumi 20 Nov 2022 00e025547cce514353354b526c73c485b91afeee m

  Add zero iteration cases in the return dictionary check

  • casatasks/tests/tasks/test_task_tclean.py (version 00e025547cce514353354b526c73c485b91afeee) (diffs)
  • casatestutils/casatestutils/imagerhelpers/imagetesthelpers.py (version 00e025547cce514353354b526c73c485b91afeee) (diffs)
• 

  Takahiro Tsutsumi 18 Nov 2022 435ee47fcb8a551e6ef21eeca65b1cc9d2e98ff0 m

  Additional tests for deconvolve

  • casatasks/tests/tasks/test_task_deconvolve.py (version 435ee47fcb8a551e6ef21eeca65b1cc9d2e98ff0) (diffs)
• 

  Takahiro Tsutsumi 18 Nov 2022 0dafe610c895c1bcf95632902c5827aca566f71b m

  Add new tests for fullsummary. Add a new test helper function, check_ret_structure and call to this function from checkall when 'ret' argument is specified.

  • casatasks/tests/tasks/test_task_sdintimaging.py (version 0dafe610c895c1bcf95632902c5827aca566f71b) (diffs)
  • casatasks/tests/tasks/test_task_tclean.py (version 0dafe610c895c1bcf95632902c5827aca566f71b) (diffs)
  • casatestutils/casatestutils/imagerhelpers/imagetesthelpers.py (version 0dafe610c895c1bcf95632902c5827aca566f71b) (diffs)
• 

  Takahiro Tsutsumi 18 Nov 2022 c0d71a28a4f88bd2dc23a057469fa06d44de56c8 m

  Futher edit and change the sdintimaging and deconvolve tasks' fullsummary default to True to match with tclean's

  • casatasks/xml/deconvolve.xml (version c0d71a28a4f88bd2dc23a057469fa06d44de56c8) (diffs)
  • casatasks/xml/sdintimaging.xml (version c0d71a28a4f88bd2dc23a057469fa06d44de56c8) (diffs)
  • casatasks/xml/tclean.xml (version c0d71a28a4f88bd2dc23a057469fa06d44de56c8) (diffs)
• 

  Takahiro Tsutsumi 17 Nov 2022 9b6cbb6fcee74d07e0ccb5b026ecc8510547cb85 m

  The fullsummary parameter description rewording based on the feedback during the code review

  • casatasks/xml/deconvolve.xml (version 9b6cbb6fcee74d07e0ccb5b026ecc8510547cb85) (diffs)
  • casatasks/xml/sdintimaging.xml (version 9b6cbb6fcee74d07e0ccb5b026ecc8510547cb85) (diffs)
  • casatasks/xml/tclean.xml (version 9b6cbb6fcee74d07e0ccb5b026ecc8510547cb85) (diffs)
• 

  Takahiro Tsutsumi 17 Nov 2022 13f359a5671bbd94b934d820e0acebc7a11a627b m

  Add new tests for fullsummary parameter for cube and mfs. Add a new test helper function, check_ret_structure to check conformance of the return dictionary.

  • casatasks/tests/tasks/test_task_tclean.py (version 13f359a5671bbd94b934d820e0acebc7a11a627b) (diffs)
  • casatestutils/casatestutils/imagerhelpers/imagetesthelpers.py (version 13f359a5671bbd94b934d820e0acebc7a11a627b) (diffs)
• 

  Takahiro Tsutsumi 16 Nov 2022 666ac8199d66a2a5cbddbb394b951e7446331542 m

  Remove a debug statement

  • casatools/src/code/synthesis/ImagerObjects/SDAlgorithmBase.cc (version 666ac8199d66a2a5cbddbb394b951e7446331542) (diffs)
• 

  Takahiro Tsutsumi 15 Nov 2022 245542d912d70de049d811ca28af3861bbb16b07 m

  Delete more debug print statements

  • casatasks/src/private/task_tclean.py (version 245542d912d70de049d811ca28af3861bbb16b07) (diffs)
• 

  Takahiro Tsutsumi 15 Nov 2022 d123fdde3c308b2179641b4d55cefac6554658ab m

  Remove a debug print statement

  • casatasks/tests/tasks/test_task_tclean.py (version d123fdde3c308b2179641b4d55cefac6554658ab) (diffs)
• 

  Takahiro Tsutsumi 14 Nov 2022 1b48b7daecb4667afe9846ecfde62102c8532b2a m

  Change the default of fullsummary to True. Remove few mode debugging print statements.

  • casatasks/src/private/imagerhelpers/summary_minor.py (version 1b48b7daecb4667afe9846ecfde62102c8532b2a) (diffs)
  • casatasks/tests/tasks/test_task_tclean.py (version 1b48b7daecb4667afe9846ecfde62102c8532b2a) (diffs)
  • casatasks/xml/tclean.xml (version 1b48b7daecb4667afe9846ecfde62102c8532b2a) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SynthesisDeconvolver.cc (version 1b48b7daecb4667afe9846ecfde62102c8532b2a) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version 1b48b7daecb4667afe9846ecfde62102c8532b2a) (diffs)
• 

  Takahiro Tsutsumi 10 Nov 2022 8ec278ce94a9d8d85c6a0b4f099b0457a9266247 m

  Fixed a bug in reindexing of summaryminor record in the case of outlier fields are used. Remove the debugging print statements.

  • casatasks/src/private/imagerhelpers/imager_deconvolver.py (version 8ec278ce94a9d8d85c6a0b4f099b0457a9266247) (diffs)
  • casatasks/src/private/imagerhelpers/summary_minor.py (version 8ec278ce94a9d8d85c6a0b4f099b0457a9266247) (diffs)
  • casatasks/tests/tasks/test_task_tclean.py (version 8ec278ce94a9d8d85c6a0b4f099b0457a9266247) (diffs)
  • casatests/stakeholder/test_stk_alma_pipeline_imaging.py (version 8ec278ce94a9d8d85c6a0b4f099b0457a9266247) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version 8ec278ce94a9d8d85c6a0b4f099b0457a9266247) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version 8ec278ce94a9d8d85c6a0b4f099b0457a9266247) (diffs)
• 

  Takahiro Tsutsumi 08 Nov 2022 ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6 m

  Propagate the new parameter, fullsummary to deconvolve and sdintimaging tasks

  • casatasks/src/private/task_deconvolve.py (version ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6) (diffs)
  • casatasks/src/private/task_sdintimaging.py (version ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6) (diffs)
  • casatasks/tests/tasks/test_task_deconvolve.py (version ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6) (diffs)
  • casatasks/tests/tasks/test_task_sdintimaging.py (version ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6) (diffs)
  • casatasks/xml/deconvolve.xml (version ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6) (diffs)
  • casatasks/xml/sdintimaging.xml (version ad32f9697bdb372f975b0c8d11081e0d5c3a9ad6) (diffs)
• 

  Takahiro Tsutsumi 07 Nov 2022 4d7eced3aa1ce694d98d0db0ebd8ea3f0a8b6851 m

  Fix an indentation error

  • casatasks/tests/tasks/test_task_tclean.py (version 4d7eced3aa1ce694d98d0db0ebd8ea3f0a8b6851) (diffs)
• 

  Takahiro Tsutsumi 04 Nov 2022 e2d2142965eb0beefef3063c5be21d5340ebe688 m

  Merge branch 'master' into CAS-13924
• 

  Takahiro Tsutsumi 03 Nov 2022 4eecd9f546eec1aeef6ce2c7ad825cc55363f360 m

  Fix some more bugs

  • casatasks/src/private/imagerhelpers/summary_minor.py (version 4eecd9f546eec1aeef6ce2c7ad825cc55363f360) (diffs)
  • casatasks/tests/tasks/test_task_tclean.py (version 4eecd9f546eec1aeef6ce2c7ad825cc55363f360) (diffs)
  • casatestutils/casatestutils/imagerhelpers/imagetesthelpers.py (version 4eecd9f546eec1aeef6ce2c7ad825cc55363f360) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version 4eecd9f546eec1aeef6ce2c7ad825cc55363f360) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SynthesisDeconvolver.cc (version 4eecd9f546eec1aeef6ce2c7ad825cc55363f360) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version 4eecd9f546eec1aeef6ce2c7ad825cc55363f360) (diffs)
• 

  Takahiro Tsutsumi 26 Oct 2022 f988d8711f8dd22eaf561bc8fc0dc4c0e5148d00 m

  Merge branch 'master' into CAS-13924
• 

  Takahiro Tsutsumi 26 Oct 2022 e017cd8f7eebb90c7877a2958950039038b2d933 m

  Fix some issues in summary minor record initialization

  • casatasks/src/private/imagerhelpers/imager_base.py (version e017cd8f7eebb90c7877a2958950039038b2d933) (diffs)
  • casatasks/src/private/task_tclean.py (version e017cd8f7eebb90c7877a2958950039038b2d933) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SDAlgorithmBase.cc (version e017cd8f7eebb90c7877a2958950039038b2d933) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version e017cd8f7eebb90c7877a2958950039038b2d933) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.h (version e017cd8f7eebb90c7877a2958950039038b2d933) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version e017cd8f7eebb90c7877a2958950039038b2d933) (diffs)
• 

  Takahiro Tsutsumi 24 Oct 2022 335ccda556fec4222537615041637fceb86c8c6e m

  Merge branch 'master' into CAS-13924 Resloved the Conflicts:         casatools/src/code/synthesis/ImagerObjects/SDAlgorithmBase.cc         casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc         casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.h
• 

  Takahiro Tsutsumi 24 Oct 2022 159a952dea5e715ab6fea6b057c8383e13f541db m

  Commit the modification that was missed in the last commit

  • casatasks/src/private/imagerhelpers/imager_base.py (version 159a952dea5e715ab6fea6b057c8383e13f541db) (diffs)
• 

  Takahiro Tsutsumi 18 Oct 2022 df33140e99d91b4451315769eb1f05bd2d638365 m

  Remove the use of the env. variable USE_SMALL_SUMMARYMINOR, add a new parameter, fullsummary for controlling the return dictionary size. Remove the option of 1/0 usage as the return dictionary control from interactive parameter.

  • casatasks/src/private/imagerhelpers/_gclean.py (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatasks/src/private/imagerhelpers/imager_deconvolver.py (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatasks/src/private/imagerhelpers/input_parameters.py (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatasks/src/private/imagerhelpers/summary_minor.py (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatasks/src/private/task_tclean.py (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatasks/xml/tclean.xml (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SDAlgorithmBase.cc (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SDAlgorithmBase.h (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.cc (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SIMinorCycleController.h (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SynthesisDeconvolver.cc (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SynthesisDeconvolver.h (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SynthesisUtilMethods.cc (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/SynthesisUtilMethods.h (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.cc (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
  • casatools/src/code/synthesis/ImagerObjects/grpcInteractiveClean.h (version df33140e99d91b4451315769eb1f05bd2d638365) (diffs)
• 

  Takahiro Tsutsumi 20 Sep 2022 7ec1d4af0a299cbf1e348425767176432f790604 m

  Remove lines removed from the master

  • casatools/src/code/synthesis/Parallel/Applicator.cc (version 7ec1d4af0a299cbf1e348425767176432f790604) (diffs)
• 

  Takahiro Tsutsumi 20 Sep 2022 26e2069cf3fe580963e5e9a0680199e44e299dc4 m

  Additional fix need to transfer from CAS-13683 here

  • casatools/src/code/synthesis/Parallel/Applicator.cc (version 26e2069cf3fe580963e5e9a0680199e44e299dc4) (diffs)
• 

  Takahiro Tsutsumi 19 Sep 2022 f6c5d444c421d9cf92327896a8c16d3679c1726e m

  Remove a commented line to just re-trigger build

  • casatasks/tests/tasks/test_task_tclean.py (version f6c5d444c421d9cf92327896a8c16d3679c1726e) (diffs)
• 

  Takahiro Tsutsumi 16 Sep 2022 666960f8c6f988a2de23c3ce86cb4f2ab10451a0 m

  Applying Kumar's memory buffer fix from CAS-13683

  • casatools/src/code/synthesis/Parallel/MPITransport.cc (version 666960f8c6f988a2de23c3ce86cb4f2ab10451a0) (diffs)
  • casatools/tests/tools-cxx/synthesisimager/Parallel/tApplicator.cc (version 666960f8c6f988a2de23c3ce86cb4f2ab10451a0) (diffs)