Build: #37 was successful Child of CASA-CTT-87
Code commits
OPEN-CASA
-
Ville Suoranta 81ca466bc3aba9e379151b421f3427f60842656d
Merge pull request #826 in CASA/casa from feature/CAS-9679 to master
* commit '0ae9f91891fa5beb311d705c0eec2b960de8d87a': (56 commits)
The quack is done after the full iterator has been created.
Refactor SubtableChangerTest to derive from MsFactoryTVITester
Fixed typo
Fixed the unit tests to use the new API for setFrequencySelections
Port to the new setFrequencySelections API
Port to the new setFrequencySelections API
Workaround issue with CAS-11734: getChannels() throws if phantom SPWs are present
Use the new methods in the disk layer VI to set the channel selection.
Changed the API for VisIterImpl2LayerFactory::setFrequencySelection to allow FrequencySelections.
Removed comparison of polarizationId that was mistakenly copied
Use the last API of compareVector
Move block away from if/else, since it is repeated in both clauses
Do not pass the spw parameter to the ChannelAverageTVI configuration
Fix typo
Add support for layered factory
New tests to check that SPW selection works with stacked PhaseShiftingTVI
Add layered factory support for PhaseShiftingTVI
Remove unused configuration parameter in base class FreqAxisTVI
Reduce the test loops to improve running time of test
New tests to check that SPW selection works with stacked HanningSmooth
... -
Ville Suoranta 5e55707db68acfa1a9ea7a01f596e80d92a4be37
Merge pull request #832 in CASA/casa from CAS-11858 to master
* commit 'a91c9421b9897c7efb6a35059cbcbd2cb0a45aeb':
CAS-11858 add feature for selecting by scan -
Ville Suoranta 76cda9fc6ac8becc5e16dfb013030afc9963f5ce
Merge pull request #835 in CASA/casa from CAS-12175 to master
* commit '03419ffe40a9492810a4805ceaacc038d0e7241e':
CAS-12175: incorporate late tweak to Source table in SDM in generated code -
C. Enrique Garcia Dabo 0ae9f91891fa5beb311d705c0eec2b960de8d87a
Merge branch 'master' into feature/CAS-9679
-
C. Enrique Garcia Dabo eff9720fb01485044e54ec396149c918704eba9b m
The quack is done after the full iterator has been created.
The VisibilityIterator used for preSweep() was reusing the
same visibilityIterator_p variable that was later overwritten,
creating a dangling object that messed up the status.
Fixes partially CAS-9679 -
Bob Garwood 03419ffe40a9492810a4805ceaacc038d0e7241e m
Merge branch 'master' into CAS-12175
-
C. Enrique Garcia Dabo 217b977ec356e2dd3c64a249843aebe45ecd7ee4 m
Merge branch 'master' into feature/CAS-9679
-
Bob Garwood 14a2b6126d6762b78ed1dcc809053e0b7ea733ee m
CAS-12175: incorporate late tweak to Source table in SDM in generated code
- code/alma/ASDM/SourceRow.cc (version 14a2b6126d6762b78ed1dcc809053e0b7ea733ee) (diffs)
- code/alma/ASDM/SourceRow.h (version 14a2b6126d6762b78ed1dcc809053e0b7ea733ee) (diffs)
- code/alma/ASDM/SourceTable.h (version 14a2b6126d6762b78ed1dcc809053e0b7ea733ee) (diffs)
- code/alma/apps/asdm2MS/ASDMTables.cc (version 14a2b6126d6762b78ed1dcc809053e0b7ea733ee) (diffs)
-
C. Enrique Garcia Dabo 366a20454ed9e0d0f701c0efb4c8fa70da838bcc m
Refactor SubtableChangerTest to derive from MsFactoryTVITester
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 60067487df74968d83147aee2a95c5388f8ce7bc m
Merge branch 'master' into feature/CAS-9679
-
David Mehringer a91c9421b9897c7efb6a35059cbcbd2cb0a45aeb m
CAS-11858 add feature for selecting by scan
-
C. Enrique Garcia Dabo 647b4ad76273e0b88c42ccef39d7bbc5796fc72b m
Merge branch 'master' into feature/CAS-9679
Conflicts solved:
code/flagging/Flagging/FlagMSHandler.cc -
C. Enrique Garcia Dabo 54191a49f8a681135ce451bee690bbc45c2f2f90 m
Fixed typo
Fixes CAS-9679 -
C. Enrique Garcia Dabo 93b8f9036725f0324970364938b63ffa23d882ff m
Merge commit 'be567512fdf77a95cc03cd43ca0b732b538b2ddd' into feature/CAS-9679
Conflicts solved:
code/flagging/Flagging/FlagMSHandler.h -
C. Enrique Garcia Dabo 4b49f3920a119d511146a060668f45b8c6c16e03 m
Merge commit '90f531dcbda4497ace5c71ed8427f1122f935f68' into feature/CAS-9679
Conflicts solved:
gcwrap/python/scripts/regressions/alma_asdm+reimported-asdm_sf.py -
C. Enrique Garcia Dabo aaeaa9f9b12fd9242b4751c7acf8c9f5d8d0f0e1 m
Fixed the unit tests to use the new API for setFrequencySelections
Fixes partially CAS-9679- code/mstransform/TVI/test/tChannelAverageTVI.cc (version aaeaa9f9b12fd9242b4751c7acf8c9f5d8d0f0e1) (diffs)
- code/mstransform/TVI/test/tHanningSmoothTVI.cc (version aaeaa9f9b12fd9242b4751c7acf8c9f5d8d0f0e1) (diffs)
- code/mstransform/TVI/test/tPhaseShiftingTVI.cc (version aaeaa9f9b12fd9242b4751c7acf8c9f5d8d0f0e1) (diffs)
-
C. Enrique Garcia Dabo b177d3bbe53b96d6c250b31efc2b45b8341b23ef m
Port to the new setFrequencySelections API
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo bc563f14aac69909a3518edd072e110e24947529 m
Port to the new setFrequencySelections API
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 636ca2387930fd38047e41ba0b1741cec9e2f5a9 m
Workaround issue with CAS-11734: getChannels() throws if phantom SPWs are present
CAS-11734 is causing some problems with the FreqAxisTVI class in the
presence of SPWs which are not mentioned in the DDI table.
The workaround here it to filter the spws before calling gaincal()
to avoid the exception. Since those phantom SPWs are not used by the
subsequent analysis this should be fine.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 664d9de04312e5575f5d62b7a1c56d71b7c6a56d m
Use the new methods in the disk layer VI to set the channel selection.
As per commit 01242d1c6d789cb4502dd32da3d224191bd1b65e
the channel selection should be applied to the first layer that
operates on the MS directly, which is the disk IO layer. If the
channel selection is applied to the top level VI, then the selection
happens on the potentially modified SPWs, which probably not the
intention.
Fixes partially CAS-9679- code/synthesis/MeasurementComponents/CalSolVi2Organizer.cc (version 664d9de04312e5575f5d62b7a1c56d71b7c6a56d) (diffs)
- code/synthesis/MeasurementComponents/CalSolVi2Organizer.h (version 664d9de04312e5575f5d62b7a1c56d71b7c6a56d) (diffs)
- code/synthesis/MeasurementComponents/Calibrater.cc (version 664d9de04312e5575f5d62b7a1c56d71b7c6a56d) (diffs)
- code/synthesis/MeasurementComponents/Calibrater.h (version 664d9de04312e5575f5d62b7a1c56d71b7c6a56d) (diffs)
-
C. Enrique Garcia Dabo e2f90e3c928dc24b89b3fcc4fdd8b7181a7a06e0 m
Changed the API for VisIterImpl2LayerFactory::setFrequencySelection to allow FrequencySelections.
The previous implmentation allowed to enter a single FrequencySelection,
whereas the new one allows to input a FrequencySelections, which
is in itself an aggregation of (possibly) different FrequencySelection
objects and therefore being more generic.
Fixes partially CAS-9679- code/flagging/Flagging/FlagMSHandler.cc (version e2f90e3c928dc24b89b3fcc4fdd8b7181a7a06e0) (diffs)
- code/msvis/MSVis/LayeredVi2Factory.cc (version e2f90e3c928dc24b89b3fcc4fdd8b7181a7a06e0) (diffs)
- code/msvis/MSVis/LayeredVi2Factory.h (version e2f90e3c928dc24b89b3fcc4fdd8b7181a7a06e0) (diffs)
- gcwrap/tools/ms/ms_cmpt.cc (version e2f90e3c928dc24b89b3fcc4fdd8b7181a7a06e0) (diffs)
-
C. Enrique Garcia Dabo 1e87b8e3a65f35e6377802a8024b76982835de07 m
Removed comparison of polarizationId that was mistakenly copied
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 4fe8dd4f1f1469e26c2958c69fbb4e2f16f1dc85 m
Use the last API of compareVector
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 46dd97065428fbb7c9dfa889a8d0617bf33595db m
Merge branch 'master' into feature/CAS-9679
-
C. Enrique Garcia Dabo dd919a763f7d8b47343338ba7b790c781580714f m
Merge commit 'da7a0c3f547596c745bc948dffc23568008e1c8a' into feature/CAS-9679
-
C. Enrique Garcia Dabo 2da5be9f386fe84e0e6e9b81f067596a5aa213e3 m
Merge commit '68c37c750ad322dafa0db6ffd1c876477f23a7b1' into feature/CAS-9679
Solved concflict in code/msvis/MSVis/test/TestUtilsTVI.cc -
C. Enrique Garcia Dabo 6b33012270f88c06daa837a3ddcd023248229ecd m
Merge commit '69757919130de2b739801a52b7533e08691564ba' into feature/CAS-9679
-
C. Enrique Garcia Dabo fdc86ec593e87de7cf613a038160a49c85d413c7 m
Merge commit '2e79c88d9c60f71415c6f6ab60e789dee56fce69' into feature/CAS-9679
Solved conflict on code/msvis/MSVis/test/TestUtilsTVI.cc -
C. Enrique Garcia Dabo 86b07b1eddda55512beeeeed7572b791126e36a5 m
Move block away from if/else, since it is repeated in both clauses
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo affd634aaf1b2689c8de0efbe676e93b05e5d8c6 m
Do not pass the spw parameter to the ChannelAverageTVI configuration
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 35a291adf4e79d574e94f73788f73546a0dfb06f m
Merge branch 'master' into feature/CAS-9679
-
C. Enrique Garcia Dabo 85d4064e510d74b95b13f1cefc1938f9ab0cc59a m
Fix typo
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 59933e1f06356abf8cda10e4856705f4b0bdce83 m
Add support for layered factory
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 775ab0e900928386b44afad3909e769473967e8a m
New tests to check that SPW selection works with stacked PhaseShiftingTVI
The PhaseShiftingTVI should access the selected SPWs/channels via
the underlying VI. This is in fact already implemented in the
FreqAxisTVI
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo cf1bbf875f20246cb8b76b8eaaf4d3297c1290ba m
Add layered factory support for PhaseShiftingTVI
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo eb1f0392186264961d377a44806e352e16ee07e1 m
Remove unused configuration parameter in base class FreqAxisTVI
Fixes partially CAS-9679- code/mstransform/TVI/ChannelAverageTVI.cc (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
- code/mstransform/TVI/ConvolutionTVI.cc (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
- code/mstransform/TVI/FreqAxisTVI.cc (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
- code/mstransform/TVI/FreqAxisTVI.h (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
- code/mstransform/TVI/PhaseShiftingTVI.cc (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
- code/mstransform/TVI/RegriddingTVI.cc (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
- code/mstransform/TVI/UVContSubTVI.cc (version eb1f0392186264961d377a44806e352e16ee07e1) (diffs)
-
C. Enrique Garcia Dabo b618390358dc45da860544270fa0350c35895a90 m
Reduce the test loops to improve running time of test
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 9b0bd502b5c78ae3fe8d50390aeab60588320318 m
New tests to check that SPW selection works with stacked HanningSmooth
The HanningSmoothTVI should access the selected SPWs/channels via
the underlying VI. This is in fact already implemented in the
FreqAxisTVI
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 2196b4d8eac16ba887a9f20cc4c7e346072f61d8 m
Adding a LayerFactory factory for the HanningSmoothTVI class
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 5627bfe5057e17e31acb03957a358604969e3eb6 m
Remove the configuration parameter since it is not used
The HanningSmoothTVI no longer makes any use of the
configuration parameter.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 5fbcb7705717d331f55e8195f80da2787374b1d1 m
Make the configuration parameter of the ConvolutionTVI base class optional
Once the spw parameter has been removed, there is no need for some derived
TVIs, like HanningSmooth to even have such parameter, let alon passing it
to the base class. Actually it can even be a problem if a user specifies
the "kernel" parameter in the configuration and this is passed by the
derived class to the base class without sanitizing the user input.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo ddff140dc7aa5ea920f7b52d92a25c83a806fe49 m
Fix typo in class names from wrong copy-paste
Fixes CAS-9679 -
C. Enrique Garcia Dabo d08430b6e7c91affa35927b3c313dac79557c8c0 m
Do not pass the spw parameter to the ChannelAverageTVI
Additionally, the TVI stack is created in a more straightforward
way, with a simpler logic of if's.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 0ea089110b63379f951f1711138918835bf50bf5 m
Merge branch 'master' into feature/CAS-9679
-
C. Enrique Garcia Dabo f78fc2c61af1ea109cbb91e3aad42d8f32428560 m
Use vector::push_back rather than allocating in advance
Fixes CAS-9679 -
C. Enrique Garcia Dabo ae405469a8e5fa5b3bb2439475f4038d279fed99 m
Adds unit tests to check that output SPWs are as expected
After removing the spw parsing these tests verify that the
TVI is getting the proper info regarding SPWs and channels
from the underlying TVI and that the output SPWs are correct.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 01242d1c6d789cb4502dd32da3d224191bd1b65e m
Apply the channel selection to the layer that access the MS directly
Since the ChannelAverageTVI no longer has access to the original
selection applied to the MS, the channel selection has to happen in the
layer that access directly the MS. The VisIterImpl2LayerFactory
has already been modified to support that.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 57b3a84eaf9c28ff93989c0a239788cdac978e9c m
Do not parse the spw parameter from the configuration
This commit is the meat of CAS-9679. It no longer parses the spw parameter.
Originally this was used to pass the MS selection on spw and channels.
However that breaks the layering principle. Now, it simply asks the previous
layer for the information of which SPWs and channels are available.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 4bc9738a4b832df2cbb67d67b816b604456a404d m
Fix the initialization of the z position of the synthetic antennas
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 23beabc49c072dd288d9f749625a7cdefd519170 m
Throw an exception if any of the factories in the vector is null.
Before this commit you would get a segmentation fault.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 2c80d384fb1cf6b7a1462198c6b76866f135910f m
Support setting of frequency selections in the factory
The reasoning behind this is the following: suppose a scenario
where we have an underlying MS with a channel selection and
a TVI stack that operates on that. Before thie patch you could
apply channel selection to the generated VI, but that's the
top VI, the one that operates on the already transformed
data by the other underlying TVI. You want the channel selections
to operate on the first layer that access the MS directly. The
rest of the layers just see what the layer below provide and
they don't need channel selection.
This commit allows the "disk layer" VI to apply those selections
to the MS.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo af486d791b0e0dcc5151a68ceada3de666970222 m
Fixes type in #define
Fixes CAS-9679 -
C. Enrique Garcia Dabo 735dab382021474ea4295318628d14a9131b7346 m
Fix compilation under macOS
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 7a20f788d6027edfd12cdfe5d0a43938501ffe64 m
Fixes macOS compilation
stpcpy is only available since POSIX.1-2008 (_XOPEN_SOURCE 700)
Fixes CAS-9679 -
C. Enrique Garcia Dabo d8023638715b557c8de6b749eaf74981f5d337c0 m
Use an STL vector when possible
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 58d6629efa5597162915b7dd8f90cc505f954ba3 m
Split the creation of the MS and the TVI stack
Fixes CAS-9679 -
C. Enrique Garcia Dabo bfd6ed5daa42cc5a2e0ea4d9abce95eab8fef9e8 m
Base the old class DataAccessTest on the new fixture MsFactoryTVITester
Fixes CAS-9679 -
C. Enrique Garcia Dabo b3f94aff00574a848a0a2835877a24bdba68b299 m
Add a fixture for all the TVI tests that use MsFactory
Fixes CAS-9679- code/mstransform/CMakeLists.txt (version b3f94aff00574a848a0a2835877a24bdba68b299) (diffs)
- code/msvis/CMakeLists.txt (version b3f94aff00574a848a0a2835877a24bdba68b299) (diffs)
- code/msvis/MSVis/test/TestUtilsTVI.cc (version b3f94aff00574a848a0a2835877a24bdba68b299) (diffs)
- code/msvis/MSVis/test/TestUtilsTVI.h (version b3f94aff00574a848a0a2835877a24bdba68b299) (diffs)
- code/synthesis/CMakeLists.txt (version b3f94aff00574a848a0a2835877a24bdba68b299) (diffs)
-
C. Enrique Garcia Dabo 3cbc51b3ecbf98f57256901cdee7e3da0b6b512c m
Fixed missing include
Fixes CAS-9679 -
C. Enrique Garcia Dabo f6f87e59847caa8e6a7e56d2bd1ba8d91ad7889f m
Do not depend on includes from mstransform
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo d0466eba88697b961fef88d19b62dae8b9f62a38 m
Merge commit 'c33cbaa2294bdf1b4acd72d7bb75a7bcae9eeec8' into feature/CAS-9679
-
C. Enrique Garcia Dabo dbc9f9dae7f78fcf2a9bea8139109230ffc421cd m
Merge commit '100fe70f485864112da583112283651e28323a64' into feature/CAS-9679 Solving conflict for TestUtilsTVI.cc
-
C. Enrique Garcia Dabo 0d52515a5a8997730a4be93b4c34ca6dc19ae1b0 m
Merge commit '7b9fab13f1be30ee189c3ee1510fec362fe509de' into feature/CAS-9679
-
C. Enrique Garcia Dabo e254f3aa51fa15b2cfea724089fa736520ee9725 m
Merge commit 'b0453ca058bb0d48a7de338e7ee6cff73ffb3532' into feature/CAS-9679
-
C. Enrique Garcia Dabo 8ab199a209b2932112a7e02454f06c94179d39cd m
Merge commit '2dcdc55244fc0b37074db05f93a1411cc26fce2b' into feature/CAS-9679
-
C. Enrique Garcia Dabo d5334c5b176d2c4e6bc2d346eb96cf00a674ec22 m
Use nftw to remove files rather than a system() call
The system call would spawn a new process, which confuses
tools like valgrind. On top, the nftw() function is defined POSIX
and therefore fully portable.
Fixes partially CAS-9679 -
C. Enrique Garcia Dabo 9a96e993fb8a05f13e56019d91ce9fa9b4f6d26b m
Merge branch 'bugfix/CAS-9985' into feature/CAS-9679
-
C. Enrique Garcia Dabo 043746c47c6c00e61479627889bd03b0152c9a28 m
Add test for writing flags back to the MS.
-
C. Enrique Garcia Dabo 271537ce49e9795bf6404126fb2bc293481e7551 m
Rename test.
-
C. Enrique Garcia Dabo 12375c27996b41bf5b10c2d197d060df4f1a3cd9 m
Add suport for flagging in the original unaveraged MS.
- code/mstransform/TVI/test/TestUtilsTVI.cc (version 12375c27996b41bf5b10c2d197d060df4f1a3cd9) (diffs)
- code/mstransform/TVI/test/TestUtilsTVI.h (version 12375c27996b41bf5b10c2d197d060df4f1a3cd9) (diffs)
- code/mstransform/TVI/test/tChannelAverageTVI.cc (version 12375c27996b41bf5b10c2d197d060df4f1a3cd9) (diffs)
-
C. Enrique Garcia Dabo 4d4aab790020974ab0c134426af2272574054502 m
Rename test.
-
C. Enrique Garcia Dabo 17992f2cfb5c6fdda594d2538be61fc0ea7d9fdf m
Add a new test which compares simulated data.
For an extensive combination of MS parameters, SimpleSimVi2 is
used to generate an artificial Vi2 which is transformed with
ChannelAverageTVI. The results is compared with yet another
artificial Vi2 with the expected results. -
C. Enrique Garcia Dabo 66a5e1f54af65656a32b847423052adf47cadb1c m
Changes to allow comparing SimpleSimVi2
The getVisBuffer() does not work in SimpleSimVi2, use
getImpl()->getVisBuffer() instead.
rowIds() is not implemented in SimpleSimVi2. Removing the identification
of rows, since it is not deemed essential. -
C. Enrique Garcia Dabo 99fe7b8e712ac736b6970a47085b7c8182f8e1ef m
Minor formatting
-
C. Enrique Garcia Dabo d2e32f92964ab3a17f557f32cdcaaf2b623cd275 m
Improve inline comments
Part of CAS-9679 -
C. Enrique Garcia Dabo 91b5100e7a7687a4487d6fcc08297460bb77bb9f m
Add more types to check for wrong chanbin param type
-
C. Enrique Garcia Dabo 2f38b8cbcd13f9744227faa00b17b36802817f81 m
Add test with wrong chanbin when multiple spw's are present
-
C. Enrique Garcia Dabo becdb7b6b351c2465825b2d811a1b26ebb8ccb3a m
New test for empty inputVi
-
C. Enrique Garcia Dabo 3061f0849fca3f5ab27703a31a8ba41beadab4c0 m
Throw an exception if empty Vi is empty
-
C. Enrique Garcia Dabo 1867ec763717edf6279ab90798a9ce8c32dfd150 m
Fix the assertion for the system command return value (again)
-
C. Enrique Garcia Dabo b6011fb2a0fc6de86a278ac7aa325a51d217e74f m
Use consistent space indentantion throughout
https://casa.nrao.edu/casadocs/stable/casa-processes/coding-guidelines
https://google.github.io/styleguide/cppguide.html- code/mstransform/TVI/test/tHanningSmoothTVI.cc (version b6011fb2a0fc6de86a278ac7aa325a51d217e74f) (diffs)
- code/mstransform/TVI/test/tPhaseShiftingTVI.cc (version b6011fb2a0fc6de86a278ac7aa325a51d217e74f) (diffs)
- code/mstransform/TVI/test/tRegriddingTVI.cc (version b6011fb2a0fc6de86a278ac7aa325a51d217e74f) (diffs)
- code/mstransform/TVI/test/tUVContSubTVI.cc (version b6011fb2a0fc6de86a278ac7aa325a51d217e74f) (diffs)