Ville Suoranta 28 Oct 2020 ab7e40af4eb22cb952bf78dfa41e50d94b12f076

Merge pull request #236 in CASA/casa6 from CAS-12879 to master
* commit 'ee10c312410af9598d2a994a6328093c7f78372f': (22 commits)
  Fixed code formatting
  Point casacore module back to official casacore repo
  Update casacore commit to a rebased version of msiter_compfunc branch
  Fix code formatting.
  Add unit test for degenerated case: no sorting function at all
  Add new unit tests that resets the starting of interval for time binning.
  Move the subchunk setup to the origin() method
  Add unit test that checks whether sorting in the inner loop by time also works even if MS is not sorted increasingly in time.
  Add unit test that checks sorting is equivalent in the inner and outer loops
  Fix compilation error
  Add unit test cases that allow iterations by groups of DDId/SPWs
  Better support in the SortColumns class for the full sorting specification
  Add initialization from generic sorting definitions.
  Support in the VI2 factory for full sorting specification
  Reset subchunk MSIter when calling ::origin()
  Updating casacore reference
  Attach the columns also during the chunk setup.
  Update casacore reference to last commit from msiter_compfunc branch
  Full support for user-defined sorting in subchunks
  Support sorting with generic functions
  ...

C. Enrique Garcia Dabo 26 Oct 2020 ee10c312410af9598d2a994a6328093c7f78372f m

Fixed code formatting

• casa5/code/msvis/MSVis/LayeredVi2Factory.cc (version ee10c312410af9598d2a994a6328093c7f78372f) (diffs)

C. Enrique Garcia Dabo 26 Oct 2020 7081ada12cf82ff77bc3bf3ba1783b83759040aa m

Merge branch 'master' into CAS-12879

C. Enrique Garcia Dabo 09 Sep 2020 6d69dd33a06f6ada267b67201c5793ccaf7f2523 m

Point casacore module back to official casacore repo
Fixes partially CAS-12879

• .gitmodules (version 6d69dd33a06f6ada267b67201c5793ccaf7f2523) (diffs)

C. Enrique Garcia Dabo 09 Sep 2020 efcf60180645535be0c0bdb800773bf3be9efb5a m

Merge branch 'master' into CAS-12879
Resolved Conflicts:
        casatools/casacore: casacore has been aligned
                            with CAS-13054 reference

C. Enrique Garcia Dabo 04 Aug 2020 37eef6e58f26b97e3b8aa2fc55ea98746358105e m

Merge branch 'master' into CAS-12879

C. Enrique Garcia Dabo 20 Jul 2020 d3aae1a039a745aaa89b43a59050f2982fa28435 m

Update casacore commit to a rebased version of msiter_compfunc branch
Fixes partially CAS-12879

• casatools/casacore (version d3aae1a039a745aaa89b43a59050f2982fa28435) (diffs)

C. Enrique Garcia Dabo 16 Jul 2020 240ed0228153d21a0d5095eb70595c80b42f78b4 m

Merge branch 'fix_utest_list' into CAS-12879

C. Enrique Garcia Dabo 15 Jul 2020 c56c9e1877b2ec086c2703e3279ab7a47b0f5edd m

Merge branch 'master' into CAS-12879

C. Enrique Garcia Dabo 12 Mar 2020 a29c5681e764d8f62ae8abe2cca74869733064c0 m

Fix code formatting.

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version a29c5681e764d8f62ae8abe2cca74869733064c0) (diffs)

C. Enrique Garcia Dabo 12 Mar 2020 f5e8e94fe5013a7b67396f4562586f8c99ce0714 m

Add unit test for degenerated case: no sorting function at all
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version f5e8e94fe5013a7b67396f4562586f8c99ce0714) (diffs)

C. Enrique Garcia Dabo 12 Mar 2020 32707807698325d7effadec140a56203dcae3450 m

Add new unit tests that resets the starting of interval for time binning.
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version 32707807698325d7effadec140a56203dcae3450) (diffs)

C. Enrique Garcia Dabo 12 Mar 2020 77c5785a53ae77c6ddf5d827b8d083ea664ad902 m

Move the subchunk setup to the origin() method
Previously the subchunk setup (creation of MSIter for the subchunk)
was done in configureNewChunk, which is called by nextChunk().
That way it wasn't possible to modify the sorting function for the
subchunk just before the inner loop has started.

Fixes partially CAS-12879.

• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version 77c5785a53ae77c6ddf5d827b8d083ea664ad902) (diffs)

C. Enrique Garcia Dabo 10 Mar 2020 bcebda7c7006ec489503853a8e634ce5d033e984 m

Add unit test that checks whether sorting in the inner loop by time also works even if MS is not sorted increasingly in time.
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version bcebda7c7006ec489503853a8e634ce5d033e984) (diffs)

C. Enrique Garcia Dabo 10 Mar 2020 68da7b285f2823103e500a34571b985252c7c503 m

Add unit test that checks sorting is equivalent in the inner and outer loops
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version 68da7b285f2823103e500a34571b985252c7c503) (diffs)

C. Enrique Garcia Dabo 10 Mar 2020 95fc9826636b80e2d453750482d7ab4e792e467b m

Fix compilation error
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version 95fc9826636b80e2d453750482d7ab4e792e467b) (diffs)

C. Enrique Garcia Dabo 09 Mar 2020 eeb9e01051951715eec5de3c48aa94eb8072d53f m

Add unit test cases that allow iterations by groups of DDId/SPWs
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/test/tViiLayerFactory_GT.cc (version eeb9e01051951715eec5de3c48aa94eb8072d53f) (diffs)

C. Enrique Garcia Dabo 09 Mar 2020 d4bce61dac01ef9bb8058848eef39a2e02df6940 m

Better support in the SortColumns class for the full sorting specification
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/VisibilityIterator2.cc (version d4bce61dac01ef9bb8058848eef39a2e02df6940) (diffs)
• casa5/code/msvis/MSVis/VisibilityIterator2.h (version d4bce61dac01ef9bb8058848eef39a2e02df6940) (diffs)
• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version d4bce61dac01ef9bb8058848eef39a2e02df6940) (diffs)

C. Enrique Garcia Dabo 29 Jan 2020 41dd1151c222c380f3c9a296bbf0989cf0401d1f m

Add initialization from generic sorting definitions.
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/LayeredVi2Factory.cc (version 41dd1151c222c380f3c9a296bbf0989cf0401d1f) (diffs)
• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version 41dd1151c222c380f3c9a296bbf0989cf0401d1f) (diffs)
• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.h (version 41dd1151c222c380f3c9a296bbf0989cf0401d1f) (diffs)

C. Enrique Garcia Dabo 28 Jan 2020 e5faf82f0703db77999bc613ebf36858073a1eb6 m

Support in the VI2 factory for full sorting specification
This rounds-up the commit f1352eac9d6fde1e19d8315d635ae74a8f64c0a4,
which added full sorting specification for chunk and subchunk.
With this commit the factory can be configured in a similar fashion,
allowing the stacking of TVIs with full sorting specification.
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/LayeredVi2Factory.cc (version e5faf82f0703db77999bc613ebf36858073a1eb6) (diffs)
• casa5/code/msvis/MSVis/LayeredVi2Factory.h (version e5faf82f0703db77999bc613ebf36858073a1eb6) (diffs)

C. Enrique Garcia Dabo 24 Jan 2020 d1cb817fcb769b116cca95818d014bb6039b2650 m

Reset subchunk MSIter when calling ::origin()
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version d1cb817fcb769b116cca95818d014bb6039b2650) (diffs)

C. Enrique Garcia Dabo 23 Jan 2020 2597047f8fa075038253eaf1a39ffba00107e021 m

Updating casacore reference
Fixes partially CAS-12879

• casatools/casacore (version 2597047f8fa075038253eaf1a39ffba00107e021) (diffs)

C. Enrique Garcia Dabo 23 Jan 2020 5684e47672cc5263f470a21c50ee275411e465ba m

Merge branch 'CAS-12879' of https://open-bitbucket.nrao.edu/scm/casa/casa6 into CAS-12879

C. Enrique Garcia Dabo 23 Jan 2020 752e721c6aaa4b19adf6a60e1a65aa017c49f894 m

Attach the columns also during the chunk setup.
With the new scheme the columns are attached to the
subchunk table. However, the setTileCache() function
also needs to test a few things on the columns, therefore
the columns are also attached during chunk setup
(temporarily until the subchunk is setup)

Fixes partially CAS-12879

• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version 752e721c6aaa4b19adf6a60e1a65aa017c49f894) (diffs)

C. Enrique Garcia Dabo 22 Jan 2020 217b5ccc73a63cdc6e019adb943ce720d38ed3a4 m

Update casacore reference to last commit from msiter_compfunc branch

• casatools/casacore (version 217b5ccc73a63cdc6e019adb943ce720d38ed3a4) (diffs)

C. Enrique Garcia Dabo 22 Jan 2020 f1352eac9d6fde1e19d8315d635ae74a8f64c0a4 m

Full support for user-defined sorting in subchunks
With this change the VI2 supports a fully user-defined
way to iterate within the chunks (i.e., the subchunk iteration).
If the user does not define (with the new constructor) the
sorting for subchunks, then the current behaviour is kept: provide
all rows with a given timestamps in each subchunk.

Note that commit fba861d11c2 also contains part of this work, which was
commited inadvertently.

Fixes partially CAS-12879

• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version f1352eac9d6fde1e19d8315d635ae74a8f64c0a4) (diffs)
• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.h (version f1352eac9d6fde1e19d8315d635ae74a8f64c0a4) (diffs)

C. Enrique Garcia Dabo 22 Jan 2020 a061b5d7b7b81176b95bee4cc21e7c1b0fc1cce6 m

Support sorting with generic functions
This adds support in the SortingColumns class
to define the sorting criteria in a generic way
using user-defined sorting functions.
Fixes partially CAS-12879

• casa5/code/msvis/MSVis/VisibilityIterator2.cc (version a061b5d7b7b81176b95bee4cc21e7c1b0fc1cce6) (diffs)
• casa5/code/msvis/MSVis/VisibilityIterator2.h (version a061b5d7b7b81176b95bee4cc21e7c1b0fc1cce6) (diffs)

C. Enrique Garcia Dabo 22 Jan 2020 e388a2645d84a5c15d49c6a2a9a48079f608f4b8 m

Merge branch 'CAS-12864' into CAS-12879

C. Enrique Garcia Dabo 22 Jan 2020 b938c8d919a836e6702f03172158e8328dbc2264 m

Update casacore reference to _cquike:msiter_compfunc

• casatools/casacore (version b938c8d919a836e6702f03172158e8328dbc2264) (diffs)

C. Enrique Garcia Dabo 22 Jan 2020 fba861d11c22874c34bb939f280dc22742b488ce m

Point casacore to development repository
Fixes partially CAS-12879

• .gitmodules (version fba861d11c22874c34bb939f280dc22742b488ce) (diffs)
• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.cc (version fba861d11c22874c34bb939f280dc22742b488ce) (diffs)
• casa5/code/msvis/MSVis/VisibilityIteratorImpl2.h (version fba861d11c22874c34bb939f280dc22742b488ce) (diffs)

Akeem Wells 28 Oct 2020 922301200113d4b241825e9a6cfa25a078d26911

Merge pull request #138 in CASA/casa-pkg from CAS-13188 to master
* commit '1ff281e1d5dc711db8166abd0986eb87c49592d5':
  Remove test 3415_CALTABCONVERT. Task CALTABCONVERT was deprecated

Akeem Wells <awells@humite.local> 28 Oct 2020 1ff281e1d5dc711db8166abd0986eb87c49592d5

Remove test 3415_CALTABCONVERT. Task CALTABCONVERT was deprecated

• testing/pybot-accepted/3415_CALTABCONVERT.html (version 1ff281e1d5dc711db8166abd0986eb87c49592d5) (diffs)

Akeem Wells 27 Oct 2020 5131b12a34d56b4a0353401a25f267346080038d

Merge pull request #137 in CASA/casa-pkg from CAS-13231 to master
* commit '842b8a660c31b080bcad5aaca7c976292e05faa6':
  Now that accum has been deprecated we need to remove it from the regression list of casa5

Akeem Wells <awells@humite.local> 27 Oct 2020 842b8a660c31b080bcad5aaca7c976292e05faa6

Now that accum has been deprecated we need to remove it from the regression list of casa5

• testing/pybot-accepted/8315_ACCUM_TEST.html (version 842b8a660c31b080bcad5aaca7c976292e05faa6) (diffs)