simple 22-Apr-2019 15:37:53 Build ARD - Build And Package - ARD-16 - Tag Branch for Packages #2 (ARD-BPT13-TBFP-2) started building on agent cbt-el7-4.cv.nrao.edu simple 22-Apr-2019 15:37:53 Remote agent on host cbt-el7-4.cv.nrao.edu simple 22-Apr-2019 15:37:53 Build working directory is /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP simple 22-Apr-2019 15:37:53 Executing build ARD - Build And Package - ARD-16 - Tag Branch for Packages #2 (ARD-BPT13-TBFP-2) simple 22-Apr-2019 15:37:53 Skipping execution of task 'Checkout Default Repository' as it is disabled simple 22-Apr-2019 15:37:53 Running pre-build action: VCS Version Collector simple 22-Apr-2019 15:37:53 Skipping execution of task 'Checkout Default Repository' as it is disabled command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.repository.branch.name} with ARD-16 command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.buildNumber} with 2 command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.planRepository.revision} with 26ade02ab362e443e07f38cde38309e608aeef6d command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.repository.branch.name} with ARD-16 command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.repository.branch.name} with ARD-16 command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP command 22-Apr-2019 15:37:53 Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git simple 22-Apr-2019 15:37:53 Starting task 'Script' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script' command 22-Apr-2019 15:37:53 Beginning to execute external process for build 'ARD - Build And Package - ARD-16 - Tag Branch for Packages #2 (ARD-BPT13-TBFP-2)'\n ... running command line: \n/bin/sh /export/home/cbt-el7-4/bamboohome/temp/ARD-BPT13-TBFP-2-ScriptBuildTask-7562470606477807934.sh\n ... in: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP\n ... using extra environment variables: \nbamboo_planRepository_1_branch=ARD-16\nbamboo_capability_buildmachinetype=build\nbamboo_planRepository_2_branch=master\nbamboo_planRepository_1_branchDisplayName=ARD-16\nbamboo_repository_revision_number=26ade02ab362e443e07f38cde38309e608aeef6d\nbamboo_repository_20938876_previous_revision_number=4e2f475d63bcad9c7e50c95a0dfa8ec19820b120\nbamboo_resultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT13-TBFP-2\nbamboo_repository_34079112_git_branch=ARD-16\nbamboo_repository_20938876_git_username=\nbamboo_build_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP\nbamboo_planRepository_1_name=OPEN-CASA-FULL\nbamboo_buildKey=ARD-BPT13-TBFP\nbamboo_shortPlanName=ARD-16\nbamboo_capability_hostname=cbt-el7-4.cv.nrao.edu\nbamboo_planRepository_2_username=\nbamboo_repository_34079112_name=OPEN-CASA-FULL\nbamboo_planRepository_name=OPEN-CASA-FULL\nbamboo_buildNumber=2\nbamboo_planRepository_2_branchDisplayName=master\nbamboo_capability_system_jdk_JDK_1_8_0_131=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-2.b11.el7_3.x86_64\nbamboo_repository_34079112_git_username=\nbamboo_shortJobName=Tag Branch for Packages\nbamboo_buildResultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT13-TBFP-2\nbamboo_planRepository_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git\nbamboo_agentId=6160386\nbamboo_planName=ARD - Build And Package - ARD-16\nbamboo_shortPlanKey=BPT13\nbamboo_shortJobKey=TBFP\nbamboo_planRepository_2_name=OPEN-CASA-PKG\nbamboo_planRepository_revision=26ade02ab362e443e07f38cde38309e608aeef6d\nbamboo_buildTimeStamp=2019-04-22T15:34:17.475-04:00\nbamboo_repository_previous_revision_number=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18\nbamboo_casaadm_password=********\nbamboo_repository_34079112_previous_revision_number=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18\nbamboo_repository_20938876_git_branch=master\nbamboo_planRepository_previousRevision=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18\nbamboo_repository_20938876_branch_name=master\nbamboo_repository_20938876_name=OPEN-CASA-PKG\nbamboo_capability_system_jdk_JDK_1_8_0_144=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.144-0.b01.el7_4.x86_64\nbamboo_repository_git_branch=ARD-16\nbamboo_buildResultKey=ARD-BPT13-TBFP-2\nbamboo_repository_branch_name=ARD-16\nbamboo_capability_system_jdk_JDK_1_8_0_102=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64\nbamboo_buildPlanName=ARD - Build And Package - ARD-16 - Tag Branch for Packages\nbamboo_planRepository_1_revision=26ade02ab362e443e07f38cde38309e608aeef6d\nbamboo_capability_system_jdk_JDK_1_8_0_141=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.141-2.b16.el7_4.x86_64\nbamboo_capability_system_hg_executable=/bin/hg\nbamboo_repository_name=OPEN-CASA-PKG\nbamboo_planRepository_2_previousRevision=4e2f475d63bcad9c7e50c95a0dfa8ec19820b120\nbamboo_dependenciesDisabled=false\nbamboo_buildFailed=false\nbamboo_capability_isCIMachine=true\nbamboo_planRepository_branch=ARD-16\nbamboo_repository_34079112_branch_name=ARD-16\nbamboo_agentWorkingDirectory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir\nbamboo_capability_system_git_executable=/bin/git\nbamboo_planRepository_2_revision=f58f7395569d7d77758ab45e8beeb376e7ec00ae\nbamboo_repository_git_username=\nbamboo_capability_system_jdk_JDK_1_8_0_111=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-2.b15.el7_3.x86_64\nbamboo_capability_tag=true\nbamboo_planRepository_1_previousRevision=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18\nbamboo_capability_operating_system=EL7\nbamboo_planRepository_branchDisplayName=ARD-16\nbamboo_capability_system_jdk_JDK_1_8_0_151=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.151-5.b12.el7_4.x86_64\nbamboo_planRepository_1_type=bbserver\nbamboo_planRepository_branchName=ARD-16\nbamboo_repository_34079112_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git\nbamboo_capability_project=CASA\nbamboo_repository_20938876_revision_number=f58f7395569d7d77758ab45e8beeb376e7ec00ae\nbamboo_planRepository_2_type=bbserver\nbamboo_capability_system_jdk_JDK=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64\nbamboo_plan_storageTag=plan-33885128\nbamboo_hg_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_hg-repositories-cache\nbamboo_planRepository_2_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git\nbamboo_planRepository_1_username=\nbamboo_planRepository_type=bbserver\nbamboo_git_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_git-repositories-cache\nbamboo_ManualBuildTriggerReason_userName=sbhatnag\nbamboo_repository_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git\nbamboo_planRepository_2_branchName=master\nbamboo_repository_34079112_revision_number=26ade02ab362e443e07f38cde38309e608aeef6d\nbamboo_capability_system_builder_ant_Ant=/usr\nbamboo_tmp_directory=/export/home/cbt-el7-4/bamboohome/temp\nbamboo_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP\nbamboo_planKey=ARD-BPT13\nbamboo_planRepository_1_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git\nbamboo_planRepository_username=\nbamboo_capability_system_jdk_JDK_1_8=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64\nbamboo_repository_20938876_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git\nbamboo_capability_system_jdk_JDK_1_8_0_161=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.161-0.b14.el7_4.x86_64\nbamboo_planRepository_1_branchName=ARD-16\n build 22-Apr-2019 15:37:53 2 build 22-Apr-2019 15:37:53 26ade02ab362e443e07f38cde38309e608aeef6d build 22-Apr-2019 15:37:53 ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git build 22-Apr-2019 15:37:53 Fetching origin error 22-Apr-2019 15:37:55 From https://open-bitbucket.nrao.edu/scm/casa/casa-pkg error 22-Apr-2019 15:37:55 6d98fb5..f58f739 master -> origin/master error 22-Apr-2019 15:37:55 12c6434..07aa08c CAS-11204-pkg -> origin/CAS-11204-pkg error 22-Apr-2019 15:37:55 948fc32..b112e11 CAS-12292 -> origin/CAS-12292 error 22-Apr-2019 15:37:55 * [new branch] hotfix/CAS-12377 -> origin/hotfix/CAS-12377 build 22-Apr-2019 15:37:55 Updating 6d98fb5..f58f739 build 22-Apr-2019 15:37:55 Fast-forward build 22-Apr-2019 15:37:55 .../pybot-accepted/8703_PipelineTest_almaif.html | 159 +++++++++++++++++++++ build 22-Apr-2019 15:37:55 .../pybot-accepted/8704_PipelineTest_almasd.html | 159 +++++++++++++++++++++ build 22-Apr-2019 15:37:55 ...ipelineTest.html => 8705_PipelineTest_vla.html} | 7 +- build 22-Apr-2019 15:37:55 3 files changed, 321 insertions(+), 4 deletions(-) build 22-Apr-2019 15:37:55 create mode 100644 testing/pybot-accepted/8703_PipelineTest_almaif.html build 22-Apr-2019 15:37:55 create mode 100644 testing/pybot-accepted/8704_PipelineTest_almasd.html build 22-Apr-2019 15:37:55 rename testing/pybot-accepted/{8705_PipelineTest.html => 8705_PipelineTest_vla.html} (96%) build 22-Apr-2019 15:37:56 Starting a Gradle Daemon (subsequent builds will be faster) build 22-Apr-2019 15:38:00 :compileJava UP-TO-DATE build 22-Apr-2019 15:38:00 :compileGroovy UP-TO-DATE build 22-Apr-2019 15:38:00 :processResources UP-TO-DATE build 22-Apr-2019 15:38:00 :classes UP-TO-DATE build 22-Apr-2019 15:38:00 :jar UP-TO-DATE build 22-Apr-2019 15:38:00 :compileTestJava UP-TO-DATE build 22-Apr-2019 15:38:01 :compileTestGroovy UP-TO-DATE build 22-Apr-2019 15:38:01 :processTestResources UP-TO-DATE build 22-Apr-2019 15:38:01 :testClasses UP-TO-DATE build 22-Apr-2019 15:38:01 :test UP-TO-DATE build 22-Apr-2019 15:38:02 :uploadArchives build 22-Apr-2019 15:38:02 build 22-Apr-2019 15:38:02 BUILD SUCCESSFUL build 22-Apr-2019 15:38:02 build 22-Apr-2019 15:38:02 Total time: 6.263 secs build 22-Apr-2019 15:38:04 :createTag build 22-Apr-2019 15:38:04 workdir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP/taggitworkdir build 22-Apr-2019 15:38:04 sourcedir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP/taggitworkdir/casa build 22-Apr-2019 15:38:04 gitremote: ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git build 22-Apr-2019 15:38:04 branch: ARD-16 build 22-Apr-2019 15:38:04 Push option: true error 22-Apr-2019 15:38:05 Switched to branch 'master' build 22-Apr-2019 15:38:05 build 22-Apr-2019 15:38:05 Fetching origin error 22-Apr-2019 15:38:08 From ssh://open-bitbucket.nrao.edu:7999/casa/casa error 22-Apr-2019 15:38:08 c81779c..fc11f52 master -> origin/master error 22-Apr-2019 15:38:08 * [new branch] ARD-15 -> origin/ARD-15 error 22-Apr-2019 15:38:08 6c0e12b..26ade02 ARD-16 -> origin/ARD-16 error 22-Apr-2019 15:38:08 * [new branch] ARD-20 -> origin/ARD-20 error 22-Apr-2019 15:38:08 bb6550e..103ad5f ARD-master -> origin/ARD-master error 22-Apr-2019 15:38:08 * [new branch] CAS-11112 -> origin/CAS-11112 error 22-Apr-2019 15:38:08 * [new branch] CAS-11140 -> origin/CAS-11140 error 22-Apr-2019 15:38:08 f122fde..d021455 CAS-11204 -> origin/CAS-11204 error 22-Apr-2019 15:38:08 0845b69..ab7fb3f CAS-11917 -> origin/CAS-11917 error 22-Apr-2019 15:38:08 * [new branch] CAS-11988 -> origin/CAS-11988 error 22-Apr-2019 15:38:08 * [new branch] CAS-12088 -> origin/CAS-12088 error 22-Apr-2019 15:38:08 892cc27..516fb54 CAS-12159 -> origin/CAS-12159 error 22-Apr-2019 15:38:08 * [new branch] CAS-12293 -> origin/CAS-12293 error 22-Apr-2019 15:38:08 * [new branch] CAS-12323 -> origin/CAS-12323 error 22-Apr-2019 15:38:08 40ca35e..0a0a4f7 CAS-12327 -> origin/CAS-12327 error 22-Apr-2019 15:38:08 * [new branch] CAS-12357 -> origin/CAS-12357 error 22-Apr-2019 15:38:08 * [new branch] CAS-12364 -> origin/CAS-12364 error 22-Apr-2019 15:38:08 * [new branch] CAS-12364-broken -> origin/CAS-12364-broken error 22-Apr-2019 15:38:08 * [new branch] CAS-12365 -> origin/CAS-12365 error 22-Apr-2019 15:38:08 * [new branch] CAS-12370 -> origin/CAS-12370 error 22-Apr-2019 15:38:08 * [new branch] CAS-12372 -> origin/CAS-12372 error 22-Apr-2019 15:38:08 * [new branch] CAS-12415 -> origin/CAS-12415 error 22-Apr-2019 15:38:08 * [new branch] CAS-12416 -> origin/CAS-12416 error 22-Apr-2019 15:38:08 * [new branch] CAS-12418 -> origin/CAS-12418 error 22-Apr-2019 15:38:08 7bb077e..ff48ca5 CAS-7210 -> origin/CAS-7210 error 22-Apr-2019 15:38:08 797bef1..c2faf0a CAS-8418 -> origin/CAS-8418 error 22-Apr-2019 15:38:08 * [new branch] CAS-8950 -> origin/CAS-8950 error 22-Apr-2019 15:38:08 4f232cd..fbdf2b9 CAS-9621 -> origin/CAS-9621 error 22-Apr-2019 15:38:08 * [new branch] PIPE-298 -> origin/PIPE-298 error 22-Apr-2019 15:38:08 0563aa6..8a62777 bugfix/CAS-11139 -> origin/bugfix/CAS-11139 error 22-Apr-2019 15:38:08 61b0251..3bff702 bugfix/CAS-11191 -> origin/bugfix/CAS-11191 error 22-Apr-2019 15:38:08 25d0939..aa563a6 bugfix/CAS-11868 -> origin/bugfix/CAS-11868 error 22-Apr-2019 15:38:08 * [new branch] bugfix/CAS-12148 -> origin/bugfix/CAS-12148 error 22-Apr-2019 15:38:08 * [new branch] bugfix/CAS-12352 -> origin/bugfix/CAS-12352 error 22-Apr-2019 15:38:08 * [new branch] bugfix/CAS-12362 -> origin/bugfix/CAS-12362 error 22-Apr-2019 15:38:08 * [new branch] bugfix/CAS-12389 -> origin/bugfix/CAS-12389 error 22-Apr-2019 15:38:08 344680d..fd1769f feature/CAS-12325 -> origin/feature/CAS-12325 error 22-Apr-2019 15:38:08 * [new branch] feature/CAS-12365 -> origin/feature/CAS-12365 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-39-bugfix-CAS-11139-3 -> 5.4.0-39-bugfix-CAS-11139-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-108-feature-CAS-12325-3 -> 5.5.0-108-feature-CAS-12325-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-117-bugfix-CAS-12148-2 -> 5.5.0-117-bugfix-CAS-12148-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-12362-1 -> 5.5.0-119-bugfix-CAS-12362-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-121-feature-CAS-12365-1 -> 5.5.0-121-feature-CAS-12365-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-121-test-CAS-12323-1 -> 5.5.0-121-test-CAS-12323-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-7 -> 5.5.0-125-test-CAS-12364-7 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-127-test-CAS-12159-1 -> 5.5.0-127-test-CAS-12159-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-129-test-CAS-11140-1 -> 5.5.0-129-test-CAS-11140-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-134-test-CAS-9621-1 -> 5.5.0-134-test-CAS-9621-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-138-bugfix-CAS-12389-1 -> 5.5.0-138-bugfix-CAS-12389-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-140-test-CAS-12418-1 -> 5.5.0-140-test-CAS-12418-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-33-bugfix-CAS-11868-4 -> 5.5.0-33-bugfix-CAS-11868-4 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-43-bugfix-CAS-11191-11 -> 5.5.0-43-bugfix-CAS-11191-11 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-49-test-CAS-11917-15 -> 5.5.0-49-test-CAS-11917-15 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-55-test-CAS-8418-4 -> 5.5.0-55-test-CAS-8418-4 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-69-test-CAS-7210-9 -> 5.5.0-69-test-CAS-7210-9 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-1 -> 5.5.0-94-test-ARD-15-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-10 -> 5.5.0-94-test-ARD-15-10 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-117 -> 5.5.0-mas-117 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-121 -> 5.5.0-mas-121 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-131 -> 5.5.0-mas-131 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-140 -> 5.5.0-mas-140 error 22-Apr-2019 15:38:08 From ssh://open-bitbucket.nrao.edu:7999/casa/casa error 22-Apr-2019 15:38:08 * [new tag] 5.3.0-17-feature-CAS-9108-13 -> 5.3.0-17-feature-CAS-9108-13 error 22-Apr-2019 15:38:08 * [new tag] 5.3.0-17-feature-CAS-9108-14 -> 5.3.0-17-feature-CAS-9108-14 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-27-test-CAS-11460-5 -> 5.4.0-27-test-CAS-11460-5 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-27-test-CAS-11460-6 -> 5.4.0-27-test-CAS-11460-6 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-27-test-CAS-11460-7 -> 5.4.0-27-test-CAS-11460-7 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-43-test-CAS-10593-5 -> 5.4.0-43-test-CAS-10593-5 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-43-test-CAS-10593-6 -> 5.4.0-43-test-CAS-10593-6 error 22-Apr-2019 15:38:08 * [new tag] 5.4.0-43-test-CAS-10593-7 -> 5.4.0-43-test-CAS-10593-7 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-105-test-CAS-12308-2 -> 5.5.0-105-test-CAS-12308-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-108-feature-CAS-12325-2 -> 5.5.0-108-feature-CAS-12325-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-117-bugfix-CAS-12148-1 -> 5.5.0-117-bugfix-CAS-12148-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-117-test-CAS-12359-1 -> 5.5.0-117-test-CAS-12359-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-118-bugfix-CAS-12360-1 -> 5.5.0-118-bugfix-CAS-12360-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-118-test-CAS-12361-1 -> 5.5.0-118-test-CAS-12361-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-12103-1 -> 5.5.0-119-bugfix-CAS-12103-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-12280-1 -> 5.5.0-119-bugfix-CAS-12280-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-12280-2 -> 5.5.0-119-bugfix-CAS-12280-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-9267-1 -> 5.5.0-119-bugfix-CAS-9267-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-9267-2 -> 5.5.0-119-bugfix-CAS-9267-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-119-bugfix-CAS-9267-3 -> 5.5.0-119-bugfix-CAS-9267-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-120-bugfix-CAS-12363-1 -> 5.5.0-120-bugfix-CAS-12363-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-bugfix-CAS-12375-1 -> 5.5.0-125-bugfix-CAS-12375-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12102-1 -> 5.5.0-125-test-CAS-12102-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12102-2 -> 5.5.0-125-test-CAS-12102-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12102-3 -> 5.5.0-125-test-CAS-12102-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12302-1 -> 5.5.0-125-test-CAS-12302-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12302-2 -> 5.5.0-125-test-CAS-12302-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12302-3 -> 5.5.0-125-test-CAS-12302-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12302-4 -> 5.5.0-125-test-CAS-12302-4 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-1 -> 5.5.0-125-test-CAS-12364-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-2 -> 5.5.0-125-test-CAS-12364-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-3 -> 5.5.0-125-test-CAS-12364-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-4 -> 5.5.0-125-test-CAS-12364-4 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-5 -> 5.5.0-125-test-CAS-12364-5 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-125-test-CAS-12364-6 -> 5.5.0-125-test-CAS-12364-6 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-127-bugfix-CAS-12380-1 -> 5.5.0-127-bugfix-CAS-12380-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-127-test-CAS-12376-1 -> 5.5.0-127-test-CAS-12376-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-127-test-CAS-12376-2 -> 5.5.0-127-test-CAS-12376-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-128-test-CAS-12368-1 -> 5.5.0-128-test-CAS-12368-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-132-test-ARD-20-1 -> 5.5.0-132-test-ARD-20-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-132-test-CAS-12390-1 -> 5.5.0-132-test-CAS-12390-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-132-test-CAS-12390-2 -> 5.5.0-132-test-CAS-12390-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-132-test-CAS-12391-1 -> 5.5.0-132-test-CAS-12391-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-132-test-CAS-12394-1 -> 5.5.0-132-test-CAS-12394-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-133-test-CAS-12396-1 -> 5.5.0-133-test-CAS-12396-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-134-bugfix-CAS-12411-1 -> 5.5.0-134-bugfix-CAS-12411-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-134-bugfix-CAS-9842-1 -> 5.5.0-134-bugfix-CAS-9842-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-134-test-CAS-12407-1 -> 5.5.0-134-test-CAS-12407-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-134-test-CAS-12410-1 -> 5.5.0-134-test-CAS-12410-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-138-test-CAS-12413-1 -> 5.5.0-138-test-CAS-12413-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-138-test-CAS-12414-1 -> 5.5.0-138-test-CAS-12414-1 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-43-bugfix-CAS-11191-10 -> 5.5.0-43-bugfix-CAS-11191-10 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-55-test-CAS-8418-2 -> 5.5.0-55-test-CAS-8418-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-55-test-CAS-8418-3 -> 5.5.0-55-test-CAS-8418-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-69-test-CAS-7210-4 -> 5.5.0-69-test-CAS-7210-4 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-69-test-CAS-7210-5 -> 5.5.0-69-test-CAS-7210-5 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-69-test-CAS-7210-6 -> 5.5.0-69-test-CAS-7210-6 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-69-test-CAS-7210-7 -> 5.5.0-69-test-CAS-7210-7 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-69-test-CAS-7210-8 -> 5.5.0-69-test-CAS-7210-8 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-86-test-CAS-12168-5 -> 5.5.0-86-test-CAS-12168-5 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-86-test-CAS-12168-6 -> 5.5.0-86-test-CAS-12168-6 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-86-test-CAS-12168-7 -> 5.5.0-86-test-CAS-12168-7 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-2 -> 5.5.0-94-test-ARD-15-2 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-3 -> 5.5.0-94-test-ARD-15-3 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-4 -> 5.5.0-94-test-ARD-15-4 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-5 -> 5.5.0-94-test-ARD-15-5 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-6 -> 5.5.0-94-test-ARD-15-6 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-7 -> 5.5.0-94-test-ARD-15-7 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-8 -> 5.5.0-94-test-ARD-15-8 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-94-test-ARD-15-9 -> 5.5.0-94-test-ARD-15-9 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-116 -> 5.5.0-mas-116 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-118 -> 5.5.0-mas-118 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-119 -> 5.5.0-mas-119 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-120 -> 5.5.0-mas-120 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-122 -> 5.5.0-mas-122 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-123 -> 5.5.0-mas-123 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-124 -> 5.5.0-mas-124 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-125 -> 5.5.0-mas-125 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-126 -> 5.5.0-mas-126 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-127 -> 5.5.0-mas-127 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-128 -> 5.5.0-mas-128 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-129 -> 5.5.0-mas-129 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-130 -> 5.5.0-mas-130 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-132 -> 5.5.0-mas-132 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-133 -> 5.5.0-mas-133 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-134 -> 5.5.0-mas-134 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-135 -> 5.5.0-mas-135 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-136 -> 5.5.0-mas-136 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-137 -> 5.5.0-mas-137 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-138 -> 5.5.0-mas-138 error 22-Apr-2019 15:38:08 * [new tag] 5.5.0-mas-139 -> 5.5.0-mas-139 build 22-Apr-2019 15:38:09 Updating c81779c..fc11f52 build 22-Apr-2019 15:38:09 Fast-forward build 22-Apr-2019 15:38:09 code/air_casawvr/casawvr/mswvrdata.cpp | 2 +- build 22-Apr-2019 15:38:09 code/air_casawvr/src/apps/almaabs.cpp | 6 +- build 22-Apr-2019 15:38:09 code/air_casawvr/src/apps/arraydata.cpp | 2 +- build 22-Apr-2019 15:38:09 code/air_casawvr/src/lineparams.cpp | 6 +- build 22-Apr-2019 15:38:09 code/air_casawvr/src/radiometer_utils.cpp | 4 +- build 22-Apr-2019 15:38:09 code/air_casawvr/src/radiometer_utils.hpp | 2 +- build 22-Apr-2019 15:38:09 code/bnmin1/src/lmminutils.cxx | 2 +- build 22-Apr-2019 15:38:09 code/bnmin1/src/metropolis.cxx | 2 +- build 22-Apr-2019 15:38:09 code/bnmin1/test/t_minim.cpp | 2 +- build 22-Apr-2019 15:38:09 code/casaqt/QwtPlotter/QPCanvasHelpers.cc | 1 + build 22-Apr-2019 15:38:09 code/casaqt/QwtPlotter/QPExporter.cc | 2 +- build 22-Apr-2019 15:38:09 code/casaqt/QwtPlotter/QPScatterPlot.cc | 214 +- build 22-Apr-2019 15:38:09 code/casaqt/QwtPlotter/QPScatterPlot.h | 9 + build 22-Apr-2019 15:38:09 code/casatools/CMakeLists.txt | 5 + build 22-Apr-2019 15:38:09 code/casatools/Data/Opt.h | 56 + build 22-Apr-2019 15:38:09 code/casatools/protos/shutdown.proto | 11 + build 22-Apr-2019 15:38:09 .../SpectralComponents/SpectralListFactory.cc | 2 +- build 22-Apr-2019 15:38:09 code/display/QtViewer/grpcViewerAdaptor.cc | 125 + build 22-Apr-2019 15:38:09 code/display/QtViewer/grpcViewerAdaptor.qo.h | 206 ++ build 22-Apr-2019 15:38:09 code/display/protos/img.proto | 20 + build 22-Apr-2019 15:38:09 code/flagging/Flagging/FlagAgentBase.cc | 5 + build 22-Apr-2019 15:38:09 code/flagging/Flagging/FlagCalTableHandler.cc | 12 +- build 22-Apr-2019 15:38:09 code/flagging/Flagging/FlagMSHandler.cc | 18 +- build 22-Apr-2019 15:38:09 code/flagging/Flagging/Flagger.cc | 12 +- build 22-Apr-2019 15:38:09 code/flagging/Flagging/RFFlagCube.cc | 4 +- build 22-Apr-2019 15:38:09 code/graphics/GenericPlotter/Plot.h | 8 + build 22-Apr-2019 15:38:09 code/graphics/GenericPlotter/PlotData.h | 8 +- build 22-Apr-2019 15:38:09 code/imageanalysis/Annotations/AnnotationBase.h | 22 +- build 22-Apr-2019 15:38:09 code/imageanalysis/IO/RegionTextParser.h | 11 +- build 22-Apr-2019 15:38:09 .../imageanalysis/ImageAnalysis/ImageDecimator.tcc | 32 +- build 22-Apr-2019 15:38:09 .../ImageAnalysis/ImagePolarimetry.cc | 2 +- build 22-Apr-2019 15:38:09 code/imageanalysis/ImageAnalysis/ImageTask.tcc | 19 +- build 22-Apr-2019 15:38:09 code/miriad/apps/carmafiller/carmafiller.cc | 2 +- build 22-Apr-2019 15:38:09 code/mstransform/TVI/StatWtTVI.cc | 43 +- build 22-Apr-2019 15:38:09 code/msvis/MSVis/SpectralWindow.cc | 2 +- build 22-Apr-2019 15:38:09 code/msvis/MSVis/VisBufferUtil.cc | 156 +- build 22-Apr-2019 15:38:09 code/msvis/MSVis/VisImagingWeight.cc | 94 + build 22-Apr-2019 15:38:09 code/msvis/MSVis/VisImagingWeight.h | 11 +- build 22-Apr-2019 15:38:09 code/msvis/MSVis/test/AveragingTvi2_Test.cc | 34 +- build 22-Apr-2019 15:38:09 code/msvis/MSVis/test/VisibilityProcessing_Test.h | 2 +- build 22-Apr-2019 15:38:09 code/plotms/Actions/ActionExport.cc | 2 +- build 22-Apr-2019 15:38:09 code/plotms/Data/CalCache.cc | 2 +- build 22-Apr-2019 15:38:09 code/plotms/Data/MSCache.cc | 53 + build 22-Apr-2019 15:38:09 code/plotms/Data/MSCache.h | 2 + build 22-Apr-2019 15:38:09 code/plotms/Data/PlotMSCacheBase.cc | 11 +- build 22-Apr-2019 15:38:09 code/plotms/Data/PlotMSCacheBase.h | 5 + build 22-Apr-2019 15:38:09 code/plotms/Data/PlotMSIndexer.cc | 355 ++- build 22-Apr-2019 15:38:09 code/plotms/Data/PlotMSIndexer.h | 53 +- build 22-Apr-2019 15:38:09 code/plotms/GuiTabs/PlotMSDataSymbolWidget.cc | 92 +- build 22-Apr-2019 15:38:09 code/plotms/GuiTabs/PlotMSDataSymbolWidget.qo.h | 1 + build 22-Apr-2019 15:38:09 code/plotms/GuiTabs/PlotMSDataSymbolWidget.ui | 142 +- build 22-Apr-2019 15:38:09 code/plotms/PlotMS/PlotMSDBusApp.cc | 12 + build 22-Apr-2019 15:38:09 code/plotms/PlotMS/PlotMSDBusApp.h | 2 + build 22-Apr-2019 15:38:09 code/plotms/Plots/PlotMSPlot.cc | 82 +- build 22-Apr-2019 15:38:09 code/plotms/Plots/PlotMSPlotParameterGroups.cc | 65 +- build 22-Apr-2019 15:38:09 code/plotms/Plots/PlotMSPlotParameterGroups.h | 64 +- build 22-Apr-2019 15:38:09 code/plotms/Threads/CacheThread.cc | 4 +- build 22-Apr-2019 15:38:09 code/spectrallines/Splatalogue/SearchEngine.cc | 2 +- build 22-Apr-2019 15:38:09 code/synthesis/CMakeLists.txt | 3 + build 22-Apr-2019 15:38:09 code/synthesis/CalTables/CLPatchPanel.cc | 31 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SDAlgorithmBase.cc | 2 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SDMaskHandler.cc | 11 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SIImageStore.cc | 47 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SIImageStore.h | 6 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SynthesisImager.cc | 57 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SynthesisImager.h | 13 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SynthesisImagerVi2.cc | 150 +- build 22-Apr-2019 15:38:09 code/synthesis/ImagerObjects/SynthesisImagerVi2.h | 11 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/Calibrater.cc | 56 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/Calibrater.h | 6 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/DJones.cc | 14 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/DJones.h | 3 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/KJones.cc | 20 +- build 22-Apr-2019 15:38:09 .../MeasurementComponents/SolvableVisCal.cc | 34 +- build 22-Apr-2019 15:38:09 .../MeasurementComponents/SolvableVisCal.h | 13 + build 22-Apr-2019 15:38:09 .../MeasurementComponents/SolveDataBuffer.cc | 222 +- build 22-Apr-2019 15:38:09 .../MeasurementComponents/SolveDataBuffer.h | 51 +- build 22-Apr-2019 15:38:09 .../MeasurementComponents/StandardVisCal.cc | 42 + build 22-Apr-2019 15:38:09 .../MeasurementComponents/StandardVisCal.h | 5 + build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/VisCal.cc | 1 + build 22-Apr-2019 15:38:09 .../MeasurementComponents/VisCalGlobals.cc | 12 + build 22-Apr-2019 15:38:09 .../MeasurementComponents/VisCalSolver2.cc | 389 ++- build 22-Apr-2019 15:38:09 .../MeasurementComponents/VisCalSolver2.h | 19 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/XJones.cc | 3028 ++++++++++++++++++++ build 22-Apr-2019 15:38:09 code/synthesis/MeasurementComponents/XJones.h | 499 ++++ build 22-Apr-2019 15:38:09 .../MeasurementComponents/test/tDJones_GT.cc | 1 + build 22-Apr-2019 15:38:09 .../MeasurementComponents/test/tGJones_GT.cc | 292 ++ build 22-Apr-2019 15:38:09 .../test/tSolveDataBuffer_GT.cc | 2 + build 22-Apr-2019 15:38:09 .../MeasurementComponents/test/tXJones_GT.cc | 853 ++++++ build 22-Apr-2019 15:38:09 code/synthesis/MeasurementEquations/Imager2.cc | 11 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementEquations/SkyEquation.cc | 26 +- build 22-Apr-2019 15:38:09 code/synthesis/MeasurementEquations/VisEquation.cc | 164 ++ build 22-Apr-2019 15:38:09 code/synthesis/MeasurementEquations/VisEquation.h | 16 +- build 22-Apr-2019 15:38:09 .../MeasurementEquations/test/tPredictComp.cc | 105 + build 22-Apr-2019 15:38:09 code/synthesis/TransformMachines/BeamSkyJones.cc | 97 +- build 22-Apr-2019 15:38:09 code/synthesis/TransformMachines/BeamSkyJones.h | 15 +- build 22-Apr-2019 15:38:09 code/synthesis/TransformMachines/SkyJones.h | 4 +- build 22-Apr-2019 15:38:09 code/synthesis/TransformMachines2/BeamSkyJones.cc | 12 +- build 22-Apr-2019 15:38:09 code/synthesis/TransformMachines2/BeamSkyJones.h | 2 +- build 22-Apr-2019 15:38:09 gcwrap/python/CMakeLists.txt | 2 + build 22-Apr-2019 15:38:09 gcwrap/python/scripts/imagerhelpers/imager_base.py | 7 + build 22-Apr-2019 15:38:09 .../imagerhelpers/imager_parallel_continuum.py | 96 +- build 22-Apr-2019 15:38:09 .../scripts/imagerhelpers/input_parameters.py | 6 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/init_tasks.py | 6 +- build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/001_3C391polim.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/002_3C129.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/003_3C219D_test.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/004_accum_test.html | 144 - build 22-Apr-2019 15:38:09 .../pybot/casa/005_asdm-imexport+analysis.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/006_async-segfault.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/007_calstat_test.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/008_cleanhelper_test.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/009_cleanchan_test.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/010_coordsystest.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/011_cvel_test.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/012_equinox_vis.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/013_fits-import-export.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/014_fls3a_hi.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/015_h121.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/016_ic2233.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/017_imagepoltest.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/018_imagetest.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/019_irc_cs_task.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/020_l02d.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/021_listcal.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/022_listvis.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/023_ngc2403.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/024_ngc5921redux.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/025_ori_hc3n.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/026_ori_sio.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/027_orionmos4sim.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/028_orionmosaic.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/030_pointing_test.html | 144 - build 22-Apr-2019 15:38:09 .../pybot/casa/031_polcal_20080224_cband.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/032_pylabmem.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/033_sim_m51c.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/034_sim_m51tp.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/035_sim_ppdisk.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/036_sim_testcomp.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/037_stokesimaging_test.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/038_testcube2.html | 144 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/039_third4826.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/040_time_then_chan_avg.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/041_wideband.html | 144 - build 22-Apr-2019 15:38:09 .../pybot/casa/042_wproject_regression.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/043_widebandmosaic.html | 144 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/044_alma-m100-sd.html | 144 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/099_Bandpass.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/100_Boxit.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/105_Calanalysis.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/110_Caltabconvert.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/115_Clean.html | 158 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/120_Cleanhelper.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/125_Clearstat.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/130_Componentlist.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/135_Concat.html | 158 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/140_Conjugatevis.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/145_Coordsys.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/150_Csvclean.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/155_Cvel.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/160_Cvelfreqs.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/165_Exportasdm.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/170_Fixplanets.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/175_Fixvis.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/180_Flagcmd.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/185_Flagdata.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/190_Fluxscale.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/193_Gaincal.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/195_Gencal.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/200_Getchunk.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/205_Hanningsmooth.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/206_Hanningsmooth2.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/210_Ia_adddegaxes.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/215_Ia_commonbeam.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/220_Ia_continuumsub.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/225_Ia_convertflux.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/230_Ia_convolve.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/235_Ia_convolve2d.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/240_Ia_crop.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/245_Ia_decompose.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/250_Ia_deconvolvecomponentlist.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/255_Ia_deconvolvefrombeam.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/260_Ia_fft.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/265_Ia_getregion.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/270_Ia_hanning.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/275_Ia_histograms.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/280_Ia_imageconcat.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/285_Ia_insert.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/290_Ia_isconform.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/295_Ia_modify.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/300_Ia_pad.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/305_Ia_pv.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/310_Ia_rebin.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/315_Ia_replacemaskedpixels.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/320_Ia_restoringbeam.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/325_Ia_rotate.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/330_Ia_sepconvolve.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/335_Ia_subimage.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/340_Ia_summary.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/345_Ia_toascii.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/350_Ia_tofits.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/355_Ia_twopointcorrelation.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/365_Imcontsub.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/370_Imfit.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/375_Imhead.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/385_Immoments.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/390_Impbcor.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/395_Importasdm.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/400_Importasdm_sd.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/405_Importevla.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/410_Importfitsidi.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/420_Imsmooth.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/430_Imtrans.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/435_Imval.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/440_Listhistory.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/445_Listobs.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/450_Listpartition.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/455_Makemask.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/460_Measures.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/465_Msmd.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/470_Msmoments.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/475_Mstransform.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/476_Mstransform_mms.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/480_Partition.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/490_Plotants.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/495_Plotuv.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/500_Po_complexfraclinpol.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/505_Po_complexlinpol.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/510_Po_depolratio.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/515_Po_fourierrotationmeasure.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/520_Po_fraclinpol.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/525_Po_fractotpol.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/530_Po_linpolint.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/535_Po_linpolposang.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/540_Po_rotationmeasure.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/545_Po_sigma.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/550_Po_sigmadepolratio.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/555_Po_sigmafraclinpol.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/560_Po_sigmafractotpol.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/565_Po_sigmalinpolint.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/570_Po_sigmalinpolposang.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/575_Po_totpolint.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/580_Report.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/585_Rg_frombcs.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/590_Rg_fromtextfile.html | 151 - build 22-Apr-2019 15:38:09 .../pybot/casa/595_Rg_selectedchannels.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/600_Sdbaseline.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/605_Sdcal.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/610_Sdcal2.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/615_Sdcoadd.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/620_Sdfit.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/625_Sdflag.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/630_Sdflagmanager.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/635_Sdgrid.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/640_Sdimaging.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/645_Sdimprocess.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/650_Sdlist.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/655_Sdmath.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/660_Sdreduce.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/665_Sdsave.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/670_Sdscale.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/680_Sdstat.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/685_Sdtpimaging.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/690_Setjy.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/695_Simobserve.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/705_Slsearch.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/710_Smoothcal.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/715_Specfit.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/720_Splattotable.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/730_Spxfit.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/735_Statwt.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/740_Uvcontsub.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/745_Uvcontsub3.html | 151 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/750_Virtualconcat.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/755_Vishead.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/760_Visstat.html | 151 - build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/765_Vpmanager.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/770_Wvrgcal.html | 151 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/__init__.html | 354 --- build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/bin/casapy-version | 149 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/bin/cbtdistro | 905 ------ build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/bin/postprocess-report | 123 - build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/bin/publish-current-html | 71 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/pybot/casa/bin/xvfb-casapy | 233 -- build 22-Apr-2019 15:38:09 .../pybot/casa/lib/CasaRegression-ORIGINAL.py | 480 ---- build 22-Apr-2019 15:38:09 .../scripts/pybot/casa/lib/CasaRegression.py | 528 ---- build 22-Apr-2019 15:38:09 .../python/scripts/pybot/casa/lib/failure_msg.txt | 10 - build 22-Apr-2019 15:38:09 gcwrap/python/scripts/regressions/CMakeLists.txt | 7 +- build 22-Apr-2019 15:38:09 .../scripts/regressions/pipelineTest_almaif.py | 3 + build 22-Apr-2019 15:38:09 .../scripts/regressions/pipelineTest_almasd.py | 3 + build 22-Apr-2019 15:38:09 .../regressions/pipelineTest_regression_almaif.py | 168 ++ build 22-Apr-2019 15:38:09 .../regressions/pipelineTest_regression_almasd.py | 394 +++ build 22-Apr-2019 15:38:09 ...egression.py => pipelineTest_regression_vla.py} | 14 +- build 22-Apr-2019 15:38:09 .../python/scripts/regressions/pipelineTest_vla.py | 3 + build 22-Apr-2019 15:38:09 .../scripts/regressions/tests/CMakeLists.txt | 5 +- build 22-Apr-2019 15:38:09 .../regressions/tests/pipelineTest_almaif.py | 37 + build 22-Apr-2019 15:38:09 .../regressions/tests/pipelineTest_almasd.py | 37 + build 22-Apr-2019 15:38:09 .../tests/{pipelineTest.py => pipelineTest_vla.py} | 2 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_apparentsens.py | 72 + build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_applycal.py | 27 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_clean.py | 6 + build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_gaincal.py | 7 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_plotms.py | 14 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_polcal.py | 11 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_polfromgain.py | 204 ++ build 22-Apr-2019 15:38:09 gcwrap/python/scripts/task_tclean.py | 6 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/tests/test_plotms.py | 85 +- build 22-Apr-2019 15:38:09 gcwrap/python/scripts/tests/test_refimager.py | 4 + build 22-Apr-2019 15:38:09 gcwrap/tasks/CMakeLists.txt | 2 + build 22-Apr-2019 15:38:09 gcwrap/tasks/accor.xml | 427 +-- build 22-Apr-2019 15:38:09 gcwrap/tasks/accum.xml | 239 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/apparentsens.xml | 530 ++++ build 22-Apr-2019 15:38:09 gcwrap/tasks/applycal.xml | 492 ++-- build 22-Apr-2019 15:38:09 gcwrap/tasks/asdmsummary.xml | 31 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/bandpass.xml | 632 ++-- build 22-Apr-2019 15:38:09 gcwrap/tasks/blcal.xml | 421 ++- build 22-Apr-2019 15:38:09 gcwrap/tasks/browsetable.xml | 96 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/calstat.xml | 76 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/caltabconvert.xml | 90 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/clean.xml | 10 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/clearcal.xml | 129 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/clearstat.xml | 15 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/concat.xml | 252 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/conjugatevis.xml | 48 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/cvel2.xml | 604 ++-- build 22-Apr-2019 15:38:09 gcwrap/tasks/delmod.xml | 72 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/exportasdm.xml | 112 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/exportfits.xml | 85 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/exportuvfits.xml | 268 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/feather.xml | 114 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/fixplanets.xml | 150 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/fixvis.xml | 159 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/flagdata.xml | 2650 +++++++++-------- build 22-Apr-2019 15:38:09 gcwrap/tasks/fluxscale.xml | 374 ++- build 22-Apr-2019 15:38:09 gcwrap/tasks/ft.xml | 168 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/gaincal.xml | 672 +++-- build 22-Apr-2019 15:38:09 gcwrap/tasks/gencal.xml | 444 ++- build 22-Apr-2019 15:38:09 gcwrap/tasks/hanningsmooth.xml | 317 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/imcollapse.xml | 184 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/imcontsub.xml | 99 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/imhead.xml | 401 +-- build 22-Apr-2019 15:38:09 gcwrap/tasks/imhistory.xml | 79 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/impbcor.xml | 142 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importasap.xml | 55 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importasdm.xml | 551 ++-- build 22-Apr-2019 15:38:09 gcwrap/tasks/importatca.xml | 109 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importfits.xml | 109 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importfitsidi.xml | 80 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importgmrt.xml | 50 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importmiriad.xml | 76 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importnro.xml | 51 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/importvla.xml | 192 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/plotms.xml | 27 + build 22-Apr-2019 15:38:09 gcwrap/tasks/polcal.xml | 3 + build 22-Apr-2019 15:38:09 gcwrap/tasks/polfromgain.xml | 56 + build 22-Apr-2019 15:38:09 gcwrap/tasks/setjy.xml | 916 +++--- build 22-Apr-2019 15:38:09 gcwrap/tasks/simalma.xml | 57 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/simobserve.xml | 677 +++-- build 22-Apr-2019 15:38:09 gcwrap/tasks/splattotable.xml | 45 +- build 22-Apr-2019 15:38:09 gcwrap/tasks/split.xml | 462 +-- build 22-Apr-2019 15:38:09 gcwrap/tasks/tclean.xml | 46 +- build 22-Apr-2019 15:38:09 gcwrap/tools/CMakeLists.txt | 1 + build 22-Apr-2019 15:38:09 gcwrap/tools/casaswig_types.cc | 29 + build 22-Apr-2019 15:38:09 gcwrap/tools/casaswig_types.h | 13 + build 22-Apr-2019 15:38:09 gcwrap/tools/images/coordsys.xml | 16 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/coordsys_cmpt.cc | 4 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/image.xml | 126 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/image_cmpt.cc | 2 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/image_private.h | 6 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/imagemetadata_cmpt.cc | 4 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/imagemetadata_private.h | 2 +- build 22-Apr-2019 15:38:09 gcwrap/tools/images/imagepol_cmpt.cc | 2 +- build 22-Apr-2019 15:38:09 gcwrap/tools/measures/measures_cmpt.cc | 2 +- build 22-Apr-2019 15:38:09 gcwrap/tools/ms/msmetadata_cmpt.cc | 8 +- build 22-Apr-2019 15:38:09 gcwrap/tools/plotms/plotms.xml | 33 +- build 22-Apr-2019 15:38:09 gcwrap/tools/plotms/plotms_cmpt.cc | 15 + build 22-Apr-2019 15:38:09 gcwrap/tools/scimath/functional_private.h | 4 +- build 22-Apr-2019 15:38:09 gcwrap/tools/spectralline/spectralline_cmpt.cc | 4 +- build 22-Apr-2019 15:38:09 gcwrap/tools/synthesis/calibrater.xml | 11 + build 22-Apr-2019 15:38:09 gcwrap/tools/synthesis/calibrater_cmpt.cc | 6 +- build 22-Apr-2019 15:38:09 gcwrap/tools/synthesis/imager.xml | 3 +- build 22-Apr-2019 15:38:09 gcwrap/tools/synthesis/simulator.xml | 2 +- build 22-Apr-2019 15:38:09 gcwrap/tools/synthesis/synthesisimager.xml | 27 +- build 22-Apr-2019 15:38:09 gcwrap/tools/synthesis/synthesisimager_cmpt.cc | 28 +- build 22-Apr-2019 15:38:09 384 files changed, 17170 insertions(+), 35916 deletions(-) build 22-Apr-2019 15:38:09 create mode 100644 code/casatools/Data/Opt.h build 22-Apr-2019 15:38:09 create mode 100644 code/casatools/protos/shutdown.proto build 22-Apr-2019 15:38:09 create mode 100644 code/display/QtViewer/grpcViewerAdaptor.cc build 22-Apr-2019 15:38:09 create mode 100644 code/display/QtViewer/grpcViewerAdaptor.qo.h build 22-Apr-2019 15:38:09 create mode 100644 code/display/protos/img.proto build 22-Apr-2019 15:38:09 create mode 100644 code/synthesis/MeasurementComponents/XJones.cc build 22-Apr-2019 15:38:09 create mode 100644 code/synthesis/MeasurementComponents/XJones.h build 22-Apr-2019 15:38:09 create mode 100644 code/synthesis/MeasurementComponents/test/tXJones_GT.cc build 22-Apr-2019 15:38:09 create mode 100644 code/synthesis/MeasurementEquations/test/tPredictComp.cc build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/001_3C391polim.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/002_3C129.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/003_3C219D_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/004_accum_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/005_asdm-imexport+analysis.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/006_async-segfault.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/007_calstat_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/008_cleanhelper_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/009_cleanchan_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/010_coordsystest.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/011_cvel_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/012_equinox_vis.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/013_fits-import-export.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/014_fls3a_hi.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/015_h121.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/016_ic2233.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/017_imagepoltest.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/018_imagetest.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/019_irc_cs_task.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/020_l02d.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/021_listcal.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/022_listvis.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/023_ngc2403.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/024_ngc5921redux.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/025_ori_hc3n.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/026_ori_sio.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/027_orionmos4sim.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/028_orionmosaic.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/030_pointing_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/031_polcal_20080224_cband.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/032_pylabmem.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/033_sim_m51c.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/034_sim_m51tp.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/035_sim_ppdisk.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/036_sim_testcomp.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/037_stokesimaging_test.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/038_testcube2.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/039_third4826.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/040_time_then_chan_avg.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/041_wideband.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/042_wproject_regression.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/043_widebandmosaic.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/044_alma-m100-sd.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/099_Bandpass.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/100_Boxit.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/105_Calanalysis.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/110_Caltabconvert.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/115_Clean.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/120_Cleanhelper.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/125_Clearstat.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/130_Componentlist.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/135_Concat.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/140_Conjugatevis.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/145_Coordsys.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/150_Csvclean.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/155_Cvel.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/160_Cvelfreqs.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/165_Exportasdm.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/170_Fixplanets.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/175_Fixvis.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/180_Flagcmd.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/185_Flagdata.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/190_Fluxscale.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/193_Gaincal.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/195_Gencal.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/200_Getchunk.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/205_Hanningsmooth.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/206_Hanningsmooth2.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/210_Ia_adddegaxes.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/215_Ia_commonbeam.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/220_Ia_continuumsub.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/225_Ia_convertflux.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/230_Ia_convolve.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/235_Ia_convolve2d.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/240_Ia_crop.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/245_Ia_decompose.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/250_Ia_deconvolvecomponentlist.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/255_Ia_deconvolvefrombeam.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/260_Ia_fft.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/265_Ia_getregion.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/270_Ia_hanning.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/275_Ia_histograms.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/280_Ia_imageconcat.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/285_Ia_insert.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/290_Ia_isconform.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/295_Ia_modify.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/300_Ia_pad.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/305_Ia_pv.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/310_Ia_rebin.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/315_Ia_replacemaskedpixels.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/320_Ia_restoringbeam.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/325_Ia_rotate.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/330_Ia_sepconvolve.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/335_Ia_subimage.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/340_Ia_summary.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/345_Ia_toascii.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/350_Ia_tofits.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/355_Ia_twopointcorrelation.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/365_Imcontsub.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/370_Imfit.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/375_Imhead.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/385_Immoments.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/390_Impbcor.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/395_Importasdm.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/400_Importasdm_sd.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/405_Importevla.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/410_Importfitsidi.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/420_Imsmooth.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/430_Imtrans.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/435_Imval.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/440_Listhistory.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/445_Listobs.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/450_Listpartition.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/455_Makemask.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/460_Measures.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/465_Msmd.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/470_Msmoments.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/475_Mstransform.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/476_Mstransform_mms.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/480_Partition.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/490_Plotants.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/495_Plotuv.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/500_Po_complexfraclinpol.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/505_Po_complexlinpol.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/510_Po_depolratio.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/515_Po_fourierrotationmeasure.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/520_Po_fraclinpol.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/525_Po_fractotpol.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/530_Po_linpolint.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/535_Po_linpolposang.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/540_Po_rotationmeasure.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/545_Po_sigma.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/550_Po_sigmadepolratio.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/555_Po_sigmafraclinpol.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/560_Po_sigmafractotpol.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/565_Po_sigmalinpolint.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/570_Po_sigmalinpolposang.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/575_Po_totpolint.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/580_Report.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/585_Rg_frombcs.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/590_Rg_fromtextfile.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/595_Rg_selectedchannels.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/600_Sdbaseline.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/605_Sdcal.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/610_Sdcal2.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/615_Sdcoadd.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/620_Sdfit.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/625_Sdflag.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/630_Sdflagmanager.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/635_Sdgrid.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/640_Sdimaging.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/645_Sdimprocess.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/650_Sdlist.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/655_Sdmath.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/660_Sdreduce.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/665_Sdsave.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/670_Sdscale.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/680_Sdstat.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/685_Sdtpimaging.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/690_Setjy.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/695_Simobserve.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/705_Slsearch.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/710_Smoothcal.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/715_Specfit.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/720_Splattotable.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/730_Spxfit.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/735_Statwt.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/740_Uvcontsub.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/745_Uvcontsub3.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/750_Virtualconcat.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/755_Vishead.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/760_Visstat.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/765_Vpmanager.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/770_Wvrgcal.html build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/__init__.html build 22-Apr-2019 15:38:09 delete mode 100755 gcwrap/python/scripts/pybot/casa/bin/casapy-version build 22-Apr-2019 15:38:09 delete mode 100755 gcwrap/python/scripts/pybot/casa/bin/cbtdistro build 22-Apr-2019 15:38:09 delete mode 100755 gcwrap/python/scripts/pybot/casa/bin/postprocess-report build 22-Apr-2019 15:38:09 delete mode 100755 gcwrap/python/scripts/pybot/casa/bin/publish-current-html build 22-Apr-2019 15:38:09 delete mode 100755 gcwrap/python/scripts/pybot/casa/bin/xvfb-casapy build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/lib/CasaRegression-ORIGINAL.py build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/lib/CasaRegression.py build 22-Apr-2019 15:38:09 delete mode 100644 gcwrap/python/scripts/pybot/casa/lib/failure_msg.txt build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/pipelineTest_almaif.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/pipelineTest_almasd.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/pipelineTest_regression_almaif.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/pipelineTest_regression_almasd.py build 22-Apr-2019 15:38:09 rename gcwrap/python/scripts/regressions/{pipelineTest_regression.py => pipelineTest_regression_vla.py} (92%) build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/pipelineTest_vla.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/tests/pipelineTest_almaif.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/regressions/tests/pipelineTest_almasd.py build 22-Apr-2019 15:38:09 rename gcwrap/python/scripts/regressions/tests/{pipelineTest.py => pipelineTest_vla.py} (93%) build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/task_apparentsens.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/python/scripts/task_polfromgain.py build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/tasks/apparentsens.xml build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/tasks/polfromgain.xml build 22-Apr-2019 15:38:09 create mode 100644 gcwrap/tools/casaswig_types.cc build 22-Apr-2019 15:38:09 build 22-Apr-2019 15:38:09 edu.nrao.gradle.casa.build.GitRepository@36da926 build 22-Apr-2019 15:38:09 getLastTag called with build 22-Apr-2019 15:38:09 branch: ARD-16 build 22-Apr-2019 15:38:09 env: [bamboo_planRepository_1_branch=ARD-16, PATH=/bin:/usr/lib64/qt-3.3/bin:/usr/lib64/ccache:/usr/local/bin:/usr/bin:/usr/local/sbin:/usr/sbin, bamboo_planRepository_2_branch=master, HISTCONTROL=ignoredups, bamboo_repository_revision_number=26ade02ab362e443e07f38cde38309e608aeef6d, bamboo_planRepository_1_branchDisplayName=ARD-16, bamboo_repository_20938876_previous_revision_number=4e2f475d63bcad9c7e50c95a0dfa8ec19820b120, bamboo_repository_34079112_git_branch=ARD-16, GUESTFISH_RESTORE=\e[0m, bamboo_repository_20938876_git_username=, WRAPPER_BITS=32, bamboo_buildKey=ARD-BPT13-TBFP, bamboo_repository_34079112_name=OPEN-CASA-FULL, PROMPT_COMMAND=history -a, PWD=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP/casa-pkg/gradle/casa-tag, bamboo_capability_system_jdk_JDK_1_8_0_131=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.131-2.b11.el7_3.x86_64, bamboo_planRepository_2_branchDisplayName=master, HISTTIMEFORMAT=%Y-%m-%d %T: , bamboo_shortJobName=Tag Branch for Packages, bamboo_repository_34079112_git_username=, bamboo_buildResultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT13-TBFP-2, bamboo_planRepository_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, LESSOPEN=||/usr/bin/lesspipe.sh %s, QT_GRAPHICSSYSTEM_CHECKED=1, QTINC=/usr/lib64/qt-3.3/include, bamboo_agentId=6160386, GUESTFISH_INIT=\e[1;34m, bamboo_planRepository_revision=26ade02ab362e443e07f38cde38309e608aeef6d, bamboo_casaadm_password=********, bamboo_planRepository_previousRevision=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18, bamboo_repository_34079112_previous_revision_number=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18, bamboo_repository_20938876_git_branch=master, bamboo_repository_20938876_name=OPEN-CASA-PKG, bamboo_capability_system_jdk_JDK_1_8_0_144=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.144-0.b01.el7_4.x86_64, bamboo_repository_branch_name=ARD-16, SHLVL=3, bamboo_capability_system_jdk_JDK_1_8_0_141=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.141-2.b16.el7_4.x86_64, QT_PLUGIN_PATH=/usr/lib64/kde4/plugins:/usr/lib/kde4/plugins, LOADEDMODULES=, WRAPPER_OS=linux, HISTSIZE=200000, TERM=xterm-256color, bamboo_dependenciesDisabled=false, XDG_SESSION_ID=3, bamboo_capability_isCIMachine=true, GRADLE_USER_HOME=/users/casaci/.gradle.el6.cbt-el7-4, bamboo_planRepository_branch=ARD-16, bamboo_repository_34079112_branch_name=ARD-16, bamboo_capability_tag=true, bamboo_capability_system_jdk_JDK_1_8_0_151=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.151-5.b12.el7_4.x86_64, bamboo_planRepository_branchName=ARD-16, bamboo_planRepository_1_type=bbserver, bamboo_repository_34079112_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, WRAPPER_FILE_SEPARATOR=/, bamboo_repository_20938876_revision_number=f58f7395569d7d77758ab45e8beeb376e7ec00ae, bamboo_capability_system_jdk_JDK=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64, SSH_CLIENT=10.2.103.75 53840 22, SSH_TTY=/dev/pts/0, CVS_RSH=ssh, WRAPPER_PATH_SEPARATOR=:, bamboo_hg_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_hg-repositories-cache, bamboo_planRepository_type=bbserver, bamboo_planRepository_1_username=, bamboo_ManualBuildTriggerReason_userName=sbhatnag, bamboo_git_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_git-repositories-cache, bamboo_planRepository_2_branchName=master, bamboo_repository_34079112_revision_number=26ade02ab362e443e07f38cde38309e608aeef6d, bamboo_capability_system_builder_ant_Ant=/usr, bamboo_tmp_directory=/export/home/cbt-el7-4/bamboohome/temp, SSH_CONNECTION=10.2.103.75 53840 10.2.96.193 22, bamboo_planKey=ARD-BPT13, bamboo_planRepository_username=, NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat, BASH_FUNC_module()=() { eval `/usr/bin/modulecmd bash $*` build 22-Apr-2019 15:38:09 }, bamboo_capability_system_jdk_JDK_1_8_0_161=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.161-0.b14.el7_4.x86_64, bamboo_planRepository_1_branchName=ARD-16, bamboo_capability_buildmachinetype=build, XDG_DATA_DIRS=/users/casaci/.local/share/flatpak/exports/share/:/var/lib/flatpak/exports/share/:/usr/local/share/:/usr/share/, bamboo_resultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT13-TBFP-2, MODULEPATH=/usr/share/Modules/modulefiles:/etc/modulefiles, bamboo_build_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP, bamboo_planRepository_1_name=OPEN-CASA-FULL, QT_GRAPHICSSYSTEM=native, bamboo_shortPlanName=ARD-16, bamboo_capability_hostname=cbt-el7-4.cv.nrao.edu, MAIL=/var/spool/mail/casaci, bamboo_planRepository_2_username=, bamboo_planRepository_name=OPEN-CASA-FULL, LOGNAME=casaci, bamboo_buildNumber=2, SHELL=/bin/bash, bamboo_planName=ARD - Build And Package - ARD-16, bamboo_shortPlanKey=BPT13, OLDPWD=/usr/lib/jvm/gradle-3.2.1, bamboo_shortJobKey=TBFP, bamboo_planRepository_2_name=OPEN-CASA-PKG, SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass, bamboo_repository_previous_revision_number=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18, bamboo_buildTimeStamp=2019-04-22T15:34:17.475-04:00, bamboo_repository_20938876_branch_name=master, bamboo_buildResultKey=ARD-BPT13-TBFP-2, bamboo_repository_git_branch=ARD-16, bamboo_capability_system_jdk_JDK_1_8_0_102=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64, bamboo_buildPlanName=ARD - Build And Package - ARD-16 - Tag Branch for Packages, LS_COLORS=rs=0:di=38;5;27:ln=38;5;51:mh=44;38;5;15:pi=40;38;5;11:so=38;5;13:do=38;5;5:bd=48;5;232;38;5;11:cd=48;5;232;38;5;3:or=48;5;232;38;5;9:mi=05;48;5;232;38;5;15:su=48;5;196;38;5;15:sg=48;5;11;38;5;16:ca=48;5;196;38;5;226:tw=48;5;10;38;5;16:ow=48;5;10;38;5;21:st=48;5;21;38;5;15:ex=38;5;34:*.tar=38;5;9:*.tgz=38;5;9:*.arc=38;5;9:*.arj=38;5;9:*.taz=38;5;9:*.lha=38;5;9:*.lz4=38;5;9:*.lzh=38;5;9:*.lzma=38;5;9:*.tlz=38;5;9:*.txz=38;5;9:*.tzo=38;5;9:*.t7z=38;5;9:*.zip=38;5;9:*.z=38;5;9:*.Z=38;5;9:*.dz=38;5;9:*.gz=38;5;9:*.lrz=38;5;9:*.lz=38;5;9:*.lzo=38;5;9:*.xz=38;5;9:*.bz2=38;5;9:*.bz=38;5;9:*.tbz=38;5;9:*.tbz2=38;5;9:*.tz=38;5;9:*.deb=38;5;9:*.rpm=38;5;9:*.jar=38;5;9:*.war=38;5;9:*.ear=38;5;9:*.sar=38;5;9:*.rar=38;5;9:*.alz=38;5;9:*.ace=38;5;9:*.zoo=38;5;9:*.cpio=38;5;9:*.7z=38;5;9:*.rz=38;5;9:*.cab=38;5;9:*.jpg=38;5;13:*.jpeg=38;5;13:*.gif=38;5;13:*.bmp=38;5;13:*.pbm=38;5;13:*.pgm=38;5;13:*.ppm=38;5;13:*.tga=38;5;13:*.xbm=38;5;13:*.xpm=38;5;13:*.tif=38;5;13:*.tiff=38;5;13:*.png=38;5;13:*.svg=38;5;13:*.svgz=38;5;13:*.mng=38;5;13:*.pcx=38;5;13:*.mov=38;5;13:*.mpg=38;5;13:*.mpeg=38;5;13:*.m2v=38;5;13:*.mkv=38;5;13:*.webm=38;5;13:*.ogm=38;5;13:*.mp4=38;5;13:*.m4v=38;5;13:*.mp4v=38;5;13:*.vob=38;5;13:*.qt=38;5;13:*.nuv=38;5;13:*.wmv=38;5;13:*.asf=38;5;13:*.rm=38;5;13:*.rmvb=38;5;13:*.flc=38;5;13:*.avi=38;5;13:*.fli=38;5;13:*.flv=38;5;13:*.gl=38;5;13:*.dl=38;5;13:*.xcf=38;5;13:*.xwd=38;5;13:*.yuv=38;5;13:*.cgm=38;5;13:*.emf=38;5;13:*.axv=38;5;13:*.anx=38;5;13:*.ogv=38;5;13:*.ogx=38;5;13:*.aac=38;5;45:*.au=38;5;45:*.flac=38;5;45:*.mid=38;5;45:*.midi=38;5;45:*.mka=38;5;45:*.mp3=38;5;45:*.mpc=38;5;45:*.ogg=38;5;45:*.ra=38;5;45:*.wav=38;5;45:*.axa=38;5;45:*.oga=38;5;45:*.spx=38;5;45:*.xspf=38;5;45:, bamboo_planRepository_1_revision=26ade02ab362e443e07f38cde38309e608aeef6d, bamboo_capability_system_hg_executable=/bin/hg, bamboo_repository_name=OPEN-CASA-PKG, bamboo_planRepository_2_previousRevision=4e2f475d63bcad9c7e50c95a0dfa8ec19820b120, XFILESEARCHPATH=/usr/dt/app-defaults/%L/Dt, LANG=en_US.UTF-8, bamboo_buildFailed=false, HISTFILESIZE=250000, bamboo_agentWorkingDirectory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir, bamboo_capability_system_git_executable=/bin/git, bamboo_planRepository_2_revision=f58f7395569d7d77758ab45e8beeb376e7ec00ae, bamboo_capability_system_jdk_JDK_1_8_0_111=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.111-2.b15.el7_3.x86_64, bamboo_planRepository_1_previousRevision=f52d52bdb46400dcb0c6e92d6dad4cdee1035f18, bamboo_repository_git_username=, bamboo_capability_operating_system=EL7, bamboo_planRepository_branchDisplayName=ARD-16, bamboo_capability_project=CASA, bamboo_planRepository_2_type=bbserver, GUESTFISH_PS1=\[\e[1;32m\]>\[\e[0;31m\] , bamboo_plan_storageTag=plan-33885128, USER=casaci, bamboo_planRepository_2_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git, bamboo_repository_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, bamboo_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP, HOSTNAME=cbt-el7-4, QTDIR=/usr/lib64/qt-3.3, MODULESHOME=/usr/share/Modules, bamboo_planRepository_1_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, bamboo_capability_system_jdk_JDK_1_8=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64, WRAPPER_ARCH=x86, KDEDIRS=/usr, bamboo_repository_20938876_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git, XDG_RUNTIME_DIR=/run/user/9285, GUESTFISH_OUTPUT=\e[0m, HOME=/users/casaci, QTLIB=/usr/lib64/qt-3.3/lib] build 22-Apr-2019 15:38:09 sourceDir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT13-TBFP/taggitworkdir/casa build 22-Apr-2019 15:38:09 Resolving CAS-/feature/bugfix tag build 22-Apr-2019 15:38:09 Branch parts: [ARD-16] build 22-Apr-2019 15:38:09 Checking for an existing tag for the branch build 22-Apr-2019 15:38:09 tagGrep: grep test-ARD-16 build 22-Apr-2019 15:38:09 java.lang.UNIXProcess@3384637f | java.lang.UNIXProcess@55439a6d | java.lang.UNIXProcess@76bd870a | java.lang.UNIXProcess@2a8f5e01 build 22-Apr-2019 15:38:09 Checking out ARD-16 error 22-Apr-2019 15:38:10 Switched to branch 'ARD-16' build 22-Apr-2019 15:38:10 Your branch is behind 'origin/ARD-16' by 16 commits, and can be fast-forwarded. build 22-Apr-2019 15:38:10 (use "git pull" to update your local branch) build 22-Apr-2019 15:38:10 build 22-Apr-2019 15:38:10 Updating ARD-16 build 22-Apr-2019 15:38:10 Updating 6c0e12b..26ade02 build 22-Apr-2019 15:38:10 Fast-forward build 22-Apr-2019 15:38:11 code/msvis/MSVis/VisBufferUtil.cc | 140 +++++++++++++----- build 22-Apr-2019 15:38:11 code/msvis/MSVis/VisBufferUtil.h | 7 +- build 22-Apr-2019 15:38:11 code/synthesis/ImagerObjects/SynthesisImagerVi2.cc | 9 +- build 22-Apr-2019 15:38:11 code/synthesis/ImagerObjects/SynthesisImagerVi2.h | 3 +- build 22-Apr-2019 15:38:11 code/synthesis/MeasurementEquations/Imager2.cc | 8 +- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/AWConvFunc.cc | 38 ++--- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/AWConvFunc.h | 14 +- build 22-Apr-2019 15:38:11 .../TransformMachines2/AWConvFuncEPJones.cc | 26 +++- build 22-Apr-2019 15:38:11 .../TransformMachines2/AWConvFuncEPJones.h | 12 +- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/AWProjectFT.cc | 23 +-- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/AWProjectFT.h | 1 - build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/AWProjectWBFT.cc | 3 +- build 22-Apr-2019 15:38:11 .../synthesis/TransformMachines2/AWVisResampler.cc | 113 +++++--------- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/AWVisResampler.h | 8 +- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/CFBuffer.cc | 20 +-- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/CFBuffer.h | 9 +- build 22-Apr-2019 15:38:11 .../TransformMachines2/ConvolutionFunction.h | 12 +- build 22-Apr-2019 15:38:11 .../TransformMachines2/IlluminationConvFunc.h | 10 +- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/PhaseGrad.cc | 50 ++++--- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/PhaseGrad.h | 10 +- build 22-Apr-2019 15:38:11 .../TransformMachines2/PointingOffsets.cc | 163 +++++++++------------ build 22-Apr-2019 15:38:11 .../synthesis/TransformMachines2/PointingOffsets.h | 19 ++- build 22-Apr-2019 15:38:11 .../TransformMachines2/SimplePBConvFunc.cc | 14 +- build 22-Apr-2019 15:38:11 .../TransformMachines2/SimplePBConvFunc.h | 4 +- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/VB2CFBMap.cc | 36 +++-- build 22-Apr-2019 15:38:11 code/synthesis/TransformMachines2/VB2CFBMap.h | 18 +-- build 22-Apr-2019 15:38:11 gcwrap/python/scripts/imagerhelpers/imager_base.py | 2 +- build 22-Apr-2019 15:38:11 gcwrap/tasks/tclean.xml | 23 +-- build 22-Apr-2019 15:38:11 28 files changed, 424 insertions(+), 371 deletions(-) build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Constructing a new tag based on 5.5.0-94-test-ARD-16-2 build 22-Apr-2019 15:38:11 Branch: ARD-16 build 22-Apr-2019 15:38:11 ARD- detected build 22-Apr-2019 15:38:11 Prefix: 5.5.0-94-test-ARD-16 build 22-Apr-2019 15:38:11 5.5.0-94-test-ARD-16-3 build 22-Apr-2019 15:38:11 Last tag: 5.5.0-94-test-ARD-16-2 build 22-Apr-2019 15:38:11 Branch: ARD-16 build 22-Apr-2019 15:38:11 Comparing tag to branch with: git diff --exit-code 5.5.0-94-test-ARD-16-2 ARD-16 build 22-Apr-2019 15:38:11 diff --git a/code/msvis/MSVis/VisBufferUtil.cc b/code/msvis/MSVis/VisBufferUtil.cc build 22-Apr-2019 15:38:11 index 503389e..0508a1a 100644 build 22-Apr-2019 15:38:11 --- a/code/msvis/MSVis/VisBufferUtil.cc build 22-Apr-2019 15:38:11 +++ b/code/msvis/MSVis/VisBufferUtil.cc build 22-Apr-2019 15:38:11 @@ -36,6 +36,7 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 @@ -48,6 +49,7 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #ifdef _OPENMP build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 @@ -645,14 +647,16 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 Int guessIndex=0; build 22-Apr-2019 15:38:11 for (uInt k=0; k key=make_pair(t[uniqIndx[k]],a); build 22-Apr-2019 15:38:11 //String key=String::toString(t[uniqIndx[k]])+String("_")+String::toString(a); build 22-Apr-2019 15:38:11 - Int row=mspc.pointingIndex(a, t[uniqIndx[k]], guessIndex); build 22-Apr-2019 15:38:11 + Int row=mspc.pointingIndex(a, t[uniqIndx[k]], guessIndex); build 22-Apr-2019 15:38:11 //cerr << "String "<< key << "pointing row "<< row << endl; build 22-Apr-2019 15:38:11 - timeAntIndex_p[oldMSId_p][key]=row > -1 ? cachedPointingDir_p[oldMSId_p].shape()[0] : -1; build 22-Apr-2019 15:38:11 + timeAntIndex_p[oldMSId_p][key]=row > -1 ? cachedPointingDir_p[oldMSId_p].shape()[0] : -1; build 22-Apr-2019 15:38:11 guessIndex=row; build 22-Apr-2019 15:38:11 if(row >-1){ build 22-Apr-2019 15:38:11 cachedPointingDir_p[oldMSId_p].resize(cachedPointingDir_p[oldMSId_p].nelements()+1, true); build 22-Apr-2019 15:38:11 @@ -668,11 +672,13 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 ///// build 22-Apr-2019 15:38:11 // String index=String::toString(vb.time()(vbrow))+String("_")+String::toString(antid); build 22-Apr-2019 15:38:11 - std::ostringstream oss; build 22-Apr-2019 15:38:11 + /*std::ostringstream oss; build 22-Apr-2019 15:38:11 oss.precision(13); build 22-Apr-2019 15:38:11 oss << vb.time()(vbrow) << "_" << antid ; build 22-Apr-2019 15:38:11 string index=oss.str(); build 22-Apr-2019 15:38:11 - Int rowincache=timeAntIndex_p[oldMSId_p][index]; build 22-Apr-2019 15:38:11 + */ build 22-Apr-2019 15:38:11 + std::pair index=make_pair(vb.time()(vbrow), antid); build 22-Apr-2019 15:38:11 + Int rowincache=timeAntIndex_p[oldMSId_p].at(index); build 22-Apr-2019 15:38:11 //cerr << "key "<< index << " index " << rowincache << endl; build 22-Apr-2019 15:38:11 tim.show("retrieved cache"); build 22-Apr-2019 15:38:11 if(rowincache <0) build 22-Apr-2019 15:38:11 @@ -682,18 +688,33 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - MDirection VisBufferUtil::getPointingDir(const vi::VisBuffer2& vb, const Int antid, const Int vbrow, const Bool usePointing){ build 22-Apr-2019 15:38:11 - Timer tim; build 22-Apr-2019 15:38:11 - tim.mark(); build 22-Apr-2019 15:38:11 + MDirection VisBufferUtil::getPointingDir(const vi::VisBuffer2& vb, const Int antid, const Int vbrow, const MDirection::Types dirframe, const Bool usePointing){ build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + //Double wtime0=omp_get_wtime(); build 22-Apr-2019 15:38:11 Int rowincache=-1; build 22-Apr-2019 15:38:11 if(usePointing){ build 22-Apr-2019 15:38:11 - ROMSColumns msc(vb.ms()); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 if(oldMSId_p != vb.msId()){ build 22-Apr-2019 15:38:11 + ROMSColumns msc(vb.ms()); build 22-Apr-2019 15:38:11 oldMSId_p=vb.msId(); build 22-Apr-2019 15:38:11 if(timeAntIndex_p.shape()(0) < (oldMSId_p+1)){ build 22-Apr-2019 15:38:11 timeAntIndex_p.resize(oldMSId_p+1, true); build 22-Apr-2019 15:38:11 cachedPointingDir_p.resize(oldMSId_p+1, true); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 + MEpoch::Types timeType=MEpoch::castType(msc.timeMeas()(0).getRef().getType()); build 22-Apr-2019 15:38:11 + Unit timeUnit(msc.timeMeas().measDesc().getUnits()(0).getName()); build 22-Apr-2019 15:38:11 + MPosition pos; build 22-Apr-2019 15:38:11 + String tel; build 22-Apr-2019 15:38:11 + if (vb.subtableColumns().observation().nrow() > 0) { build 22-Apr-2019 15:38:11 + tel =vb.subtableColumns().observation().telescopeName()(msc.observationId()(0)); build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + if (tel.length() == 0 || !tel.contains("VLA") || build 22-Apr-2019 15:38:11 + !MeasTable::Observatory(pos,tel)) { build 22-Apr-2019 15:38:11 + // unknown observatory, use first antenna build 22-Apr-2019 15:38:11 + Int ant1=vb.antenna1()(0); build 22-Apr-2019 15:38:11 + pos=vb.subtableColumns().antenna().positionMeas()(ant1); build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 if( timeAntIndex_p[oldMSId_p].empty()){ build 22-Apr-2019 15:38:11 Vector tOrig; build 22-Apr-2019 15:38:11 msc.time().getColumn(tOrig); build 22-Apr-2019 15:38:11 @@ -721,29 +742,38 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 Double *intcolptr=intervalcol.getStorage(intcolstor); build 22-Apr-2019 15:38:11 Int * antcolptr=antcol.getStorage(antcolstor); build 22-Apr-2019 15:38:11 Int npointrow=vb.ms().pointing().nrow(); build 22-Apr-2019 15:38:11 -#pragma omp parallel for firstprivate(nTimes, tuniqptr, tcolptr, antcolptr, intcolptr, npointrow), shared(mspc) build 22-Apr-2019 15:38:11 + //ofstream myfile; build 22-Apr-2019 15:38:11 + //myfile.open ("POINTING.txt", ios::trunc); build 22-Apr-2019 15:38:11 +#pragma omp parallel for firstprivate(nTimes, tuniqptr, tcolptr, antcolptr, intcolptr, npointrow, timeType, timeUnit, pos, dirframe), shared(mspc) build 22-Apr-2019 15:38:11 for (uInt a=0; a < nAnt; ++a){ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 //Double wtime1=omp_get_wtime(); build 22-Apr-2019 15:38:11 Vector indices; build 22-Apr-2019 15:38:11 - Vector theDirs(nTimes); build 22-Apr-2019 15:38:11 + //Vector theDirs(nTimes); build 22-Apr-2019 15:38:11 pointingIndex(tcolptr, antcolptr, intcolptr, npointrow, a, nTimes, tuniqptr, indices); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 #pragma omp critical build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 + MEpoch timenow(Quantity(tuniqptr[0], timeUnit),timeType); build 22-Apr-2019 15:38:11 + MeasFrame mframe(timenow, pos); build 22-Apr-2019 15:38:11 + MDirection::Convert cvt(MDirection(), MDirection::Ref(dirframe, mframe)); build 22-Apr-2019 15:38:11 for (uInt k=0; k key=make_pair(tuniqptr[k],a); build 22-Apr-2019 15:38:11 timeAntIndex_p[oldMSId_p][key]=indices[k] > -1 ? cshape : -1; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 if(indices[k] >-1){ build 22-Apr-2019 15:38:11 + timenow=MEpoch(Quantity(tuniqptr[k], timeUnit),timeType); build 22-Apr-2019 15:38:11 + mframe.resetEpoch(timenow); build 22-Apr-2019 15:38:11 + cachedPointingDir_p[oldMSId_p][cshape]=cvt(mspc.directionMeas(indices[k])); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - cachedPointingDir_p[oldMSId_p][cshape]=mspc.directionMeas(indices[k]); build 22-Apr-2019 15:38:11 cshape+=1; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -753,7 +783,6 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 cachedPointingDir_p[oldMSId_p].resize(cshape, True); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -761,16 +790,14 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 ///// build 22-Apr-2019 15:38:11 // String index=String::toString(vb.time()(vbrow))+String("_")+String::toString(antid); build 22-Apr-2019 15:38:11 - std::ostringstream oss; build 22-Apr-2019 15:38:11 + /* std::ostringstream oss; build 22-Apr-2019 15:38:11 oss.precision(13); build 22-Apr-2019 15:38:11 oss << vb.time()(vbrow) << "_" << antid ; build 22-Apr-2019 15:38:11 String index=oss.str(); build 22-Apr-2019 15:38:11 - rowincache=timeAntIndex_p[oldMSId_p][index]; build 22-Apr-2019 15:38:11 - ///////TESTOO build 22-Apr-2019 15:38:11 - /* if(rowincache>=0){ build 22-Apr-2019 15:38:11 - cerr << "msid " << oldMSId_p << " key "<< index << " index " << rowincache<< " " << cachedPointingDir_p[oldMSId_p][rowincache] << endl; build 22-Apr-2019 15:38:11 - }*/ build 22-Apr-2019 15:38:11 - ///////////// build 22-Apr-2019 15:38:11 + */ build 22-Apr-2019 15:38:11 + pair index=make_pair(vb.time()(vbrow),antid); build 22-Apr-2019 15:38:11 + rowincache=timeAntIndex_p[oldMSId_p].at(index); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 //tim.show("retrieved cache"); build 22-Apr-2019 15:38:11 }///if usepointing build 22-Apr-2019 15:38:11 if(rowincache <0) build 22-Apr-2019 15:38:11 @@ -787,48 +814,90 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 indices.set(-1); build 22-Apr-2019 15:38:11 Int guessRow=0; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 for(Int pt=0; pt < ntimes; ++pt){ build 22-Apr-2019 15:38:11 //cerr << " " << guessRow ; build 22-Apr-2019 15:38:11 - for (Int k=0; k< 2; ++k){ build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + /*for (Int k=0; k< 2; ++k){ build 22-Apr-2019 15:38:11 Int start=guessRow; build 22-Apr-2019 15:38:11 Int end=nrow; build 22-Apr-2019 15:38:11 if(k==1){ build 22-Apr-2019 15:38:11 start=0; build 22-Apr-2019 15:38:11 end=guessRow; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - for (Int i=start; i 10.0){ build 22-Apr-2019 15:38:11 + //cerr << "i " << i << " counter " << counter << " done " << done << " adder " << adder << "ant count "<< antcol[i+counter] << " diff " << abs(timecol[i+counter]-timecol[i]) << endl; build 22-Apr-2019 15:38:11 + // } build 22-Apr-2019 15:38:11 halfInt = abs(timecol[i+counter]-timecol[i])/2.0; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 else{ build 22-Apr-2019 15:38:11 halfInt = intervalcol[i]/2.0; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 if (halfInt>0.0) { build 22-Apr-2019 15:38:11 - if (timecol[i] >= ptime[pt] - halfInt && timecol[i] <= ptime[pt] + halfInt) { build 22-Apr-2019 15:38:11 - indices[pt]=i; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + if ((timecol[i] >= (ptime[pt] - halfInt)) && (timecol[i] <= (ptime[pt] + halfInt))) { build 22-Apr-2019 15:38:11 + ////TESTOO build 22-Apr-2019 15:38:11 + //if(ant==12){ build 22-Apr-2019 15:38:11 + // cerr << "timecol " << timecol[i] << " halfInt " << halfInt << " TEST " << timecol[nearestIndx] << " inx " << i << " " << nearestIndx << endl; build 22-Apr-2019 15:38:11 + //} build 22-Apr-2019 15:38:11 + indices[pt]=abs(timecol[i]-ptime[pt]) < nearval ? i : nearestIndx; build 22-Apr-2019 15:38:11 + ////////TESTOO build 22-Apr-2019 15:38:11 + if(indices[pt] > 4688000){ build 22-Apr-2019 15:38:11 + cerr << indices[pt] << " timecol " << timecol[i] << " halfInt " << halfInt << " TEST " << timecol[nearestIndx] << " nearval " << nearval << " inx " << i << " " << nearestIndx << endl; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + /////////////////// build 22-Apr-2019 15:38:11 guessRow=i; build 22-Apr-2019 15:38:11 break; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 } else { build 22-Apr-2019 15:38:11 // valid for all times (we should also handle interval<0 -> timestamps) build 22-Apr-2019 15:38:11 + cerr << "JUMPY " << i << " ant " << ant << " halfint " << halfInt << " done "<< done << endl; build 22-Apr-2019 15:38:11 indices[pt]=i; build 22-Apr-2019 15:38:11 guessRow=i; build 22-Apr-2019 15:38:11 break; build 22-Apr-2019 15:38:11 @@ -837,9 +906,10 @@ void VisBufferUtil::convertFrequency(Vector& outFreq, build 22-Apr-2019 15:38:11 }//if ant build 22-Apr-2019 15:38:11 }//start end build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - }//k build 22-Apr-2019 15:38:11 + //}//k build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 }//pt build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 //cerr << "ant " << ant << " indices " << indices << endl; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 diff --git a/code/msvis/MSVis/VisBufferUtil.h b/code/msvis/MSVis/VisBufferUtil.h build 22-Apr-2019 15:38:11 index 80011fc..fffd6b1 100644 build 22-Apr-2019 15:38:11 --- a/code/msvis/MSVis/VisBufferUtil.h build 22-Apr-2019 15:38:11 +++ b/code/msvis/MSVis/VisBufferUtil.h build 22-Apr-2019 15:38:11 @@ -37,6 +37,7 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 //forward build 22-Apr-2019 15:38:11 class VisBuffer; build 22-Apr-2019 15:38:11 @@ -162,7 +163,7 @@ public: build 22-Apr-2019 15:38:11 /// get the pointing direction for a given integration and antenna id build 22-Apr-2019 15:38:11 /// will cache it for large pointing table specially so that it can be reused pronto build 22-Apr-2019 15:38:11 casacore::MDirection getPointingDir(const VisBuffer& vb, const casacore::Int antid, const casacore::Int row); build 22-Apr-2019 15:38:11 - casacore::MDirection getPointingDir(const vi::VisBuffer2& vb, const casacore::Int antid, const casacore::Int row, const casacore::Bool usePointing=true); build 22-Apr-2019 15:38:11 + casacore::MDirection getPointingDir(const vi::VisBuffer2& vb, const casacore::Int antid, const casacore::Int row, const casacore::MDirection::Types dirframe=casacore::MDirection::AZELGEO, const casacore::Bool usePointing=true); build 22-Apr-2019 15:38:11 //get the phaseCenter for a given time ..cached so that it does not need to do small read every time of access build 22-Apr-2019 15:38:11 // time -ve means use the first time in the vb build 22-Apr-2019 15:38:11 casacore::MDirection getPhaseCenter(const vi::VisBuffer2& vb, const casacore::Double time=-1.0); build 22-Apr-2019 15:38:11 @@ -181,8 +182,8 @@ public: build 22-Apr-2019 15:38:11 // A casacore::MeasFrame for conversions build 22-Apr-2019 15:38:11 casacore::MeasFrame mframe_; build 22-Apr-2019 15:38:11 casacore::Int oldMSId_p; build 22-Apr-2019 15:38:11 - casacore::Int oldPCMSId_p; build 22-Apr-2019 15:38:11 - casacore::Vector > timeAntIndex_p; build 22-Apr-2019 15:38:11 + casacore::Int oldPCMSId_p; build 22-Apr-2019 15:38:11 + casacore::Vector, int> > timeAntIndex_p; build 22-Apr-2019 15:38:11 casacore::Vector > cachedPointingDir_p; build 22-Apr-2019 15:38:11 casacore::Vector > cachedPhaseCenter_p; build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/ImagerObjects/SynthesisImagerVi2.cc b/code/synthesis/ImagerObjects/SynthesisImagerVi2.cc build 22-Apr-2019 15:38:11 index fbb9c2f..6380ae4 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/ImagerObjects/SynthesisImagerVi2.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/ImagerObjects/SynthesisImagerVi2.cc build 22-Apr-2019 15:38:11 @@ -544,7 +544,7 @@ Bool SynthesisImagerVi2::defineImage(SynthesisParamsImage& impars, build 22-Apr-2019 15:38:11 CountedPtr ftm, iftm; build 22-Apr-2019 15:38:11 impars_p = impars; build 22-Apr-2019 15:38:11 gridpars_p = gridpars; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 try build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 @@ -615,14 +615,13 @@ Bool SynthesisImagerVi2::defineImage(SynthesisParamsImage& impars, build 22-Apr-2019 15:38:11 gridpars.convFunc, build 22-Apr-2019 15:38:11 gridpars.aTermOn,gridpars.psTermOn, gridpars.mTermOn, build 22-Apr-2019 15:38:11 gridpars.wbAWP,gridpars.cfCache,gridpars.doPointing, build 22-Apr-2019 15:38:11 - gridpars.doPBCorr,gridpars.conjBeams,gridpars.usePointing, build 22-Apr-2019 15:38:11 + gridpars.doPBCorr,gridpars.conjBeams, build 22-Apr-2019 15:38:11 gridpars.computePAStep,gridpars.rotatePAStep, build 22-Apr-2019 15:38:11 gridpars.interpolation, impars.freqFrameValid, 1000000000, 16, impars.stokes, build 22-Apr-2019 15:38:11 impars.imageName, gridpars.pointingDirCol, gridpars.skyPosThreshold, build 22-Apr-2019 15:38:11 gridpars.convSupport, gridpars.truncateSize, gridpars.gwidth, gridpars.jwidth, build 22-Apr-2019 15:38:11 gridpars.minWeight, gridpars.clipMinMax, impars.pseudoi); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 catch(AipsError &x) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 @@ -1525,7 +1524,6 @@ void SynthesisImagerVi2::unlockMSs() build 22-Apr-2019 15:38:11 const Bool doPointing, //= false, build 22-Apr-2019 15:38:11 const Bool doPBCorr, //= true, build 22-Apr-2019 15:38:11 const Bool conjBeams, //= true, build 22-Apr-2019 15:38:11 - const Bool usePointing, build 22-Apr-2019 15:38:11 const Float computePAStep, //=360.0 build 22-Apr-2019 15:38:11 const Float rotatePAStep, //=5.0 build 22-Apr-2019 15:38:11 const String interpolation, //="linear" build 22-Apr-2019 15:38:11 @@ -1588,7 +1586,6 @@ void SynthesisImagerVi2::unlockMSs() build 22-Apr-2019 15:38:11 aTermOn, psTermOn, mTermOn, wbAWP, cfCache, build 22-Apr-2019 15:38:11 doPointing, doPBCorr, conjBeams, computePAStep, build 22-Apr-2019 15:38:11 rotatePAStep, cache,tile,imageNamePrefix); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 else if ( ftname == "mosaic" || ftname== "mosft" || ftname == "mosaicft" || ftname== "MosaicFT"){ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -1747,8 +1744,6 @@ void SynthesisImagerVi2::unlockMSs() build 22-Apr-2019 15:38:11 mTermOn, wbAWP, conjBeams); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 CountedPtr po = new refim::PointingOffsets(awConvFunc->getOversampling()); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - po->setDoPointing(doPointing); build 22-Apr-2019 15:38:11 awConvFunc->setPointingOffsets(po); build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 // Construct the appropriate re-sampler. build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/ImagerObjects/SynthesisImagerVi2.h b/code/synthesis/ImagerObjects/SynthesisImagerVi2.h build 22-Apr-2019 15:38:11 index 6ccab8d..7e61dd2 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/ImagerObjects/SynthesisImagerVi2.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/ImagerObjects/SynthesisImagerVi2.h build 22-Apr-2019 15:38:11 @@ -119,7 +119,6 @@ public: build 22-Apr-2019 15:38:11 const casacore::Bool doPointing = false, build 22-Apr-2019 15:38:11 const casacore::Bool doPBCorr = true, build 22-Apr-2019 15:38:11 const casacore::Bool conjBeams = true, build 22-Apr-2019 15:38:11 - const casacore::Bool usePointing = false, build 22-Apr-2019 15:38:11 const casacore::Float computePAStep = 360.0, build 22-Apr-2019 15:38:11 const casacore::Float rotatePAStep = 5.0, build 22-Apr-2019 15:38:11 const casacore::String interpolation = casacore::String("linear"), build 22-Apr-2019 15:38:11 @@ -155,7 +154,7 @@ public: build 22-Apr-2019 15:38:11 const casacore::String cfCache, build 22-Apr-2019 15:38:11 const casacore::Bool doPointing, build 22-Apr-2019 15:38:11 const casacore::Bool doPBCorr, build 22-Apr-2019 15:38:11 - const casacore::Bool conjBeams, build 22-Apr-2019 15:38:11 + const casacore::Bool conjBeams, build 22-Apr-2019 15:38:11 const casacore::Float computePAStep, build 22-Apr-2019 15:38:11 const casacore::Float rotatePAStep, build 22-Apr-2019 15:38:11 const casacore::Int cache, build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/MeasurementEquations/Imager2.cc b/code/synthesis/MeasurementEquations/Imager2.cc build 22-Apr-2019 15:38:11 index 4036eab..a73646d 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/MeasurementEquations/Imager2.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/MeasurementEquations/Imager2.cc build 22-Apr-2019 15:38:11 @@ -198,7 +198,7 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 +//#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 @@ -2885,9 +2885,9 @@ Bool Imager::createFTMachine() build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 CountedPtr awConvFunc; build 22-Apr-2019 15:38:11 // awConvFunc = new AWConvFunc(apertureFunction,psTerm,wTerm, !wbAWP_p); build 22-Apr-2019 15:38:11 - if ((ftmachine_p=="mawproject") || (mTermOn_p)) build 22-Apr-2019 15:38:11 - awConvFunc = new AWConvFuncEPJones(apertureFunction,psTerm,wTerm,wbAWP_p); build 22-Apr-2019 15:38:11 - else build 22-Apr-2019 15:38:11 + // if ((ftmachine_p=="mawproject") || (mTermOn_p)) build 22-Apr-2019 15:38:11 + // awConvFunc = new AWConvFuncEPJones(apertureFunction,psTerm,wTerm,wbAWP_p); build 22-Apr-2019 15:38:11 + // else build 22-Apr-2019 15:38:11 awConvFunc = new AWConvFunc(apertureFunction,psTerm,wTerm,wbAWP_p); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWConvFunc.cc b/code/synthesis/TransformMachines2/AWConvFunc.cc build 22-Apr-2019 15:38:11 index 18155ee..45e7ed6 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWConvFunc.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWConvFunc.cc build 22-Apr-2019 15:38:11 @@ -84,7 +84,6 @@ AWConvFunc::AWConvFunc(const casacore::CountedPtr aTerm, build 22-Apr-2019 15:38:11 wbAWP_p=false; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - // pixFieldGrad_p.resize(2);pixFieldGrad_p=0.0; build 22-Apr-2019 15:38:11 pixFieldGrad_p.resize(2);pixFieldGrad_p(0)=0.0; pixFieldGrad_p(1)=0.0; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -139,22 +138,6 @@ AWConvFunc::AWConvFunc(const casacore::CountedPtr aTerm, build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 - Vector > AWConvFunc::findPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 - const VisBuffer2& vb, const Bool& doPointing) build 22-Apr-2019 15:38:11 - { build 22-Apr-2019 15:38:11 - Assert(po_p.null()==False && "Pointingoffset call has not been initialized in AWProjectFT call being made"); build 22-Apr-2019 15:38:11 - return po_p->findPointingOffset(image,vb,doPointing); build 22-Apr-2019 15:38:11 - // if (!doPointing) build 22-Apr-2019 15:38:11 - // {cerr<<"AWCF: Using mosaic pointing \n";return po_p->findMosaicPointingOffset(image,vb);} build 22-Apr-2019 15:38:11 - // else build 22-Apr-2019 15:38:11 - // {cerr<<"AWCF: Using antenna pointing table \n";return po_p->findAntennaPointingOffset(image,vb);} build 22-Apr-2019 15:38:11 - } build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // build 22-Apr-2019 15:38:11 - //--------------------------------------------------------------- build 22-Apr-2019 15:38:11 - // build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 void AWConvFunc::makeConjPolAxis(CoordinateSystem& cs, build 22-Apr-2019 15:38:11 Int conjStokes_in) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 @@ -2076,5 +2059,26 @@ AWConvFunc::AWConvFunc(const casacore::CountedPtr aTerm, build 22-Apr-2019 15:38:11 else os=psTerm.getOversampling(); build 22-Apr-2019 15:38:11 return os; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + // build 22-Apr-2019 15:38:11 + //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 + // build 22-Apr-2019 15:38:11 + Vector > AWConvFunc::findPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 + const VisBuffer2& vb, const Bool& doPointing) build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + Assert(po_p.null()==False && "Pointingoffset call has not been initialized in AWProjectFT call being made"); build 22-Apr-2019 15:38:11 + return po_p->findPointingOffset(image,vb,doPointing); build 22-Apr-2019 15:38:11 + // if (!doPointing) build 22-Apr-2019 15:38:11 + // {cerr<<"AWCF: Using mosaic pointing \n";return po_p->findMosaicPointingOffset(image,vb);} build 22-Apr-2019 15:38:11 + // else build 22-Apr-2019 15:38:11 + // {cerr<<"AWCF: Using antenna pointing table \n";return po_p->findAntennaPointingOffset(image,vb);} build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWConvFunc.h b/code/synthesis/TransformMachines2/AWConvFunc.h build 22-Apr-2019 15:38:11 index 5ea53c7..4f08948 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWConvFunc.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWConvFunc.h build 22-Apr-2019 15:38:11 @@ -121,11 +121,8 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 virtual void setPolMap(const casacore::Vector& polMap) {aTerm_p->setPolMap(polMap);}; build 22-Apr-2019 15:38:11 // virtual void setFeedStokes(const casacore::Vector& feedStokes) {aTerm_p->setFeedStokes(feedStokes);}; build 22-Apr-2019 15:38:11 virtual casacore::Bool findSupport(casacore::Array& func, casacore::Float& threshold,casacore::Int& origin, casacore::Int& R); build 22-Apr-2019 15:38:11 - // virtual casacore::Vector findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 - // const VisBuffer2& /*vb*/) {casacore::Vector tt(2); tt=0;return tt;}; build 22-Apr-2019 15:38:11 - virtual casacore::Vector >findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 - const VisBuffer2& /*vb*/, const casacore::Bool& doPointing); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + virtual casacore::Vector findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 + const VisBuffer2& /*vb*/) {casacore::Vector tt(2); tt=0;return tt;}; build 22-Apr-2019 15:38:11 //virtual void prepareConvFunction(const VisBuffer2& vb, VBRow2CFBMapType& cfs); build 22-Apr-2019 15:38:11 virtual void prepareConvFunction(const VisBuffer2& vb, VB2CFBMap& cfs); build 22-Apr-2019 15:38:11 casacore::Int mapAntIDToAntType(const casacore::Int& ant) {return aTerm_p->mapAntIDToAntType(ant);}; build 22-Apr-2019 15:38:11 @@ -157,6 +154,11 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 virtual casacore::CountedPtr getTerm(const casacore::String& name) build 22-Apr-2019 15:38:11 {if (name=="ATerm") return aTerm_p; else return NULL;} build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + virtual casacore::Vector >findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 + const VisBuffer2& /*vb*/, const casacore::Bool& doPointing); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 casacore::CountedPtr aTerm_p; build 22-Apr-2019 15:38:11 casacore::CountedPtr psTerm_p; build 22-Apr-2019 15:38:11 casacore::CountedPtr wTerm_p; build 22-Apr-2019 15:38:11 @@ -171,7 +173,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 void makePBSq(casacore::ImageInterface& inImage); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - casacore::Vector thePix_p; //pixFieldGrad_p; build 22-Apr-2019 15:38:11 + casacore::Vector thePix_p; build 22-Apr-2019 15:38:11 casacore::Vector >pixFieldGrad_p; build 22-Apr-2019 15:38:11 casacore::Double imRefFreq_p; build 22-Apr-2019 15:38:11 casacore::Bool wbAWP_p, conjPB_p; build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWConvFuncEPJones.cc b/code/synthesis/TransformMachines2/AWConvFuncEPJones.cc build 22-Apr-2019 15:38:11 index 4bba6a5..15e4315 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWConvFuncEPJones.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWConvFuncEPJones.cc build 22-Apr-2019 15:38:11 @@ -26,9 +26,29 @@ build 22-Apr-2019 15:38:11 //# build 22-Apr-2019 15:38:11 //# $Id$ build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 +#define MAX_FREQ 1e30 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 using namespace casacore; build 22-Apr-2019 15:38:11 namespace casa{ build 22-Apr-2019 15:38:11 @@ -54,8 +74,8 @@ namespace casa{ build 22-Apr-2019 15:38:11 Vector AWConvFuncEPJones::findPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 const VisBuffer2& vb) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - //return po_p->findMosaicPointingOffset(image,vb); build 22-Apr-2019 15:38:11 - return po_p->findAntennaPointingOffset(image,vb); build 22-Apr-2019 15:38:11 + return po_p->findMosaicPointingOffset(image,vb); build 22-Apr-2019 15:38:11 + //return po_p->findAntennaPointingOffset(image,vb); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWConvFuncEPJones.h b/code/synthesis/TransformMachines2/AWConvFuncEPJones.h build 22-Apr-2019 15:38:11 index 456187e..8f5a597 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWConvFuncEPJones.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWConvFuncEPJones.h build 22-Apr-2019 15:38:11 @@ -30,6 +30,15 @@ build 22-Apr-2019 15:38:11 #define SYNTHESIS_TRANSFORM2_AWCONVFUNCEPJONES_H build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 namespace refim{ build 22-Apr-2019 15:38:11 @@ -43,12 +52,13 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 const casacore::CountedPtr psTerm, build 22-Apr-2019 15:38:11 const casacore::CountedPtr wTerm, build 22-Apr-2019 15:38:11 const casacore::Bool wbAWP=false, build 22-Apr-2019 15:38:11 - const casacore::Bool conjPB=true): build 22-Apr-2019 15:38:11 + const casacore::Bool conjPB=casacore::True): build 22-Apr-2019 15:38:11 AWConvFunc(ATerm,psTerm,wTerm,wbAWP, conjPB) build 22-Apr-2019 15:38:11 {}; build 22-Apr-2019 15:38:11 ~AWConvFuncEPJones() {}; build 22-Apr-2019 15:38:11 AWConvFuncEPJones& operator=(const AWConvFuncEPJones& other); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + // MosaicFT related build 22-Apr-2019 15:38:11 virtual void makeConvFunction(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 const VisBuffer2& vb, build 22-Apr-2019 15:38:11 const casacore::Int wConvSize, build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWProjectFT.cc b/code/synthesis/TransformMachines2/AWProjectFT.cc build 22-Apr-2019 15:38:11 index dbca30f..7210798 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWProjectFT.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWProjectFT.cc build 22-Apr-2019 15:38:11 @@ -58,7 +58,6 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -//#include build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 //#define CONVSIZE (1024*2) build 22-Apr-2019 15:38:11 // #define OVERSAMPLING 2 build 22-Apr-2019 15:38:11 @@ -136,7 +135,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 const Bool aTermOn, build 22-Apr-2019 15:38:11 const Bool psTermOn, build 22-Apr-2019 15:38:11 const Bool wTermOn, build 22-Apr-2019 15:38:11 - const Bool mTermOn, build 22-Apr-2019 15:38:11 + const Bool,// mTermOn, build 22-Apr-2019 15:38:11 const Bool wbAWP, build 22-Apr-2019 15:38:11 const Bool conjBeams) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 @@ -157,10 +156,6 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 CountedPtr awConvFunc; build 22-Apr-2019 15:38:11 // awConvFunc = new AWConvFunc(apertureFunction,psTerm,wTerm, !wbAWP); build 22-Apr-2019 15:38:11 //if ((ftmName=="mawprojectft") || (mTermOn)) build 22-Apr-2019 15:38:11 - // if (mTermOn) build 22-Apr-2019 15:38:11 - // awConvFunc = new AWConvFuncEPJones(apertureFunction,psTerm,wTerm,wbAWP, conjBeams); build 22-Apr-2019 15:38:11 - // else build 22-Apr-2019 15:38:11 - // awConvFunc = new AWConvFunc(apertureFunction,psTerm,wTerm,wbAWP, conjBeams); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 awConvFunc = new AWConvFunc(apertureFunction,psTerm,wTerm,wbAWP, conjBeams); build 22-Apr-2019 15:38:11 return awConvFunc; build 22-Apr-2019 15:38:11 @@ -190,7 +185,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 // Get various parameters from the visibilities. build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 - //doPointing=1; build 22-Apr-2019 15:38:11 + doPointing=1; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 maxConvSupport=-1; build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 @@ -1161,7 +1156,6 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 if (!paChangeDetector.changed(vb,0)) return; build 22-Apr-2019 15:38:11 Int cfSource=CFDefs::NOTCACHED; build 22-Apr-2019 15:38:11 CoordinateSystem ftcoords; build 22-Apr-2019 15:38:11 - //Bool doPointing=false; build 22-Apr-2019 15:38:11 // Think of a generic call to get the key-values. And a build 22-Apr-2019 15:38:11 // overloadable method (or an externally supplied one?) to convert build 22-Apr-2019 15:38:11 // the values to key-ids. That will ensure that AWProjectFT build 22-Apr-2019 15:38:11 @@ -1173,11 +1167,8 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 visResampler_p->setFreqMaps(expandedSpwFreqSel_p,expandedSpwConjFreqSel_p); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 lastPAUsedForWtImg = currentCFPA = pa; build 22-Apr-2019 15:38:11 - // cerr <<"AWPFT:fCF doPointing: "< >pointingOffset(convFuncCtor_p->findPointingOffset(image,vb,doPointing)); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + Vector > pointingOffset(convFuncCtor_p->findPointingOffset(image,vb, doPointing)); build 22-Apr-2019 15:38:11 Float dPA = paChangeDetector.getParAngleTolerance().getValue("rad"); build 22-Apr-2019 15:38:11 Quantity dPAQuant = Quantity(paChangeDetector.getParAngleTolerance()); build 22-Apr-2019 15:38:11 // cfSource = visResampler_p->makeVBRow2CFBMap(*cfs2_p, build 22-Apr-2019 15:38:11 @@ -2462,7 +2453,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 vbs.conjBeams_p=conjBeams_p; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 //timer_p.mark(); build 22-Apr-2019 15:38:11 - // cerr<<"AWP:setupVBStore doPointing:"<< doPointing< >pointingOffset(convFuncCtor_p->findPointingOffset(*image, vb, doPointing)); build 22-Apr-2019 15:38:11 if (makingPSF){ build 22-Apr-2019 15:38:11 cfwts2_p->invokeGC(vbs.spwID_p); build 22-Apr-2019 15:38:11 @@ -2527,9 +2518,12 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 // vbSpw, vbFieldID)) build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + // WRONG -- WE NEED NOT CALL THIS. DELETE THIS? build 22-Apr-2019 15:38:11 + // vb2CFBMap_p->phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,(*vb2CFBMap_p)[0],vb,0); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + // visResampler_p->setFieldPhaseGrad(vb2CFBMap_p->phaseGrad_p->getFieldPointingGrad()); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - // if (phaseGrad_p.ComputeFieldPointingGrad(pointingOffset,(*vbRow2CFBMap_p)[0],vb)) build 22-Apr-2019 15:38:11 + // if (phaseGrad_p.ComputeFieldPointingGrad(pointingOffset,(*vb2CFBMap_p)[0],vb)) build 22-Apr-2019 15:38:11 // visResampler_p->setFieldPhaseGrad(phaseGrad_p.getFieldPointingGrad()); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 @@ -2552,7 +2546,6 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 // << endl; build 22-Apr-2019 15:38:11 // } build 22-Apr-2019 15:38:11 visResampler_p->setVB2CFMap(vb2CFBMap_p); build 22-Apr-2019 15:38:11 - visResampler_p->setFieldPhaseGrad(vb2CFBMap_p->getCFPhaseGrad(0)); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 // The following code is required only for GPU or multi-threaded build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWProjectFT.h b/code/synthesis/TransformMachines2/AWProjectFT.h build 22-Apr-2019 15:38:11 index 6eabd5e..ea18dc0 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWProjectFT.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWProjectFT.h build 22-Apr-2019 15:38:11 @@ -60,7 +60,6 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWProjectWBFT.cc b/code/synthesis/TransformMachines2/AWProjectWBFT.cc build 22-Apr-2019 15:38:11 index fb83997..a61ed2c 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWProjectWBFT.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWProjectWBFT.cc build 22-Apr-2019 15:38:11 @@ -862,13 +862,12 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 //timer_p.mark(); build 22-Apr-2019 15:38:11 visResamplerWt_p->copy(*visResampler_p); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - Vector > pointingOffset(convFuncCtor_p->findPointingOffset(*image, vb, doPointing)); build 22-Apr-2019 15:38:11 + Vector > pointingOffset(convFuncCtor_p->findPointingOffset(*image, vb,doPointing)); build 22-Apr-2019 15:38:11 //cerr << "AWPWB: " << pointingOffset << endl; build 22-Apr-2019 15:38:11 // visResamplerWt_p->makeVBRow2CFBMap(*cfwts2_p,*convFuncCtor_p, vb, build 22-Apr-2019 15:38:11 // paChangeDetector.getParAngleTolerance(), build 22-Apr-2019 15:38:11 // chanMap,polMap,pointingOffset); build 22-Apr-2019 15:38:11 // VB2CFBMap& theMap=visResamplerWt_p->getVBRow2CFBMap(); build 22-Apr-2019 15:38:11 - vb2CFBMap_p->setDoPointing(doPointing); build 22-Apr-2019 15:38:11 vb2CFBMap_p->makeVBRow2CFBMap(*cfwts2_p,vb, build 22-Apr-2019 15:38:11 paChangeDetector.getParAngleTolerance(), build 22-Apr-2019 15:38:11 chanMap,polMap,pointingOffset); build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWVisResampler.cc b/code/synthesis/TransformMachines2/AWVisResampler.cc build 22-Apr-2019 15:38:11 index 6bbbc40..bb28314 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWVisResampler.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWVisResampler.cc build 22-Apr-2019 15:38:11 @@ -162,7 +162,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 Complex* AWVisResampler::getConvFunc_p(const double& vbPA, Vector& cfShape, build 22-Apr-2019 15:38:11 Vector& support, build 22-Apr-2019 15:38:11 int& muellerElement, build 22-Apr-2019 15:38:11 - CFBuffer& cfb, build 22-Apr-2019 15:38:11 + CountedPtr& cfb, build 22-Apr-2019 15:38:11 Double& wVal, Int& fndx, Int& wndx, build 22-Apr-2019 15:38:11 PolMapType& mNdx, PolMapType& conjMNdx, build 22-Apr-2019 15:38:11 Int& ipol, uInt& mRow) build 22-Apr-2019 15:38:11 @@ -181,14 +181,14 @@ namespace casa{ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 if (wVal > 0.0) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - cfcell=&(*(cfb.getCFCellPtr(fndx,wndx,mNdx[ipol][mRow]))); build 22-Apr-2019 15:38:11 + cfcell=&(*(cfb->getCFCellPtr(fndx,wndx,mNdx[ipol][mRow]))); build 22-Apr-2019 15:38:11 // CFCell& cfO=cfb(fndx,wndx,mNdx[ipol][mRow]); build 22-Apr-2019 15:38:11 // convFuncV = &(*cfO.getStorage()); build 22-Apr-2019 15:38:11 // support(0)=support(1)=cfO.xSupport_p; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 else build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - cfcell=&(*(cfb.getCFCellPtr(fndx,wndx,conjMNdx[ipol][mRow]))); build 22-Apr-2019 15:38:11 + cfcell=&(*(cfb->getCFCellPtr(fndx,wndx,conjMNdx[ipol][mRow]))); build 22-Apr-2019 15:38:11 // CFCell& cfO=cfb(fndx,wndx,conjMNdx[ipol][mRow]); build 22-Apr-2019 15:38:11 // convFuncV = &(*cfO.getStorage()); build 22-Apr-2019 15:38:11 // support(0)=support(1)=cfO.xSupport_p; build 22-Apr-2019 15:38:11 @@ -206,7 +206,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 // check if it needs to be rotated. build 22-Apr-2019 15:38:11 if (convFuncV->shape().product() == 0) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - Array tt=SynthesisUtils::getCFPixels(cfb.getCFCacheDir(), cfcell->fileName_p); build 22-Apr-2019 15:38:11 + Array tt=SynthesisUtils::getCFPixels(cfb->getCFCacheDir(), cfcell->fileName_p); build 22-Apr-2019 15:38:11 cfcell->setStorage(tt); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 //cerr << (cfcell->isRotationallySymmetric_p?"o":"+"); build 22-Apr-2019 15:38:11 @@ -228,7 +228,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 // Always extract the Mueller element value from mNdx. mNdx build 22-Apr-2019 15:38:11 // carries the direct mapping between Mueller Matrix and build 22-Apr-2019 15:38:11 // Visibility vector. build 22-Apr-2019 15:38:11 - // muellerElement=cfb.getCFCellPtr(fndx,wndx,mNdx[ipol][mRow])->muellerElement_p; build 22-Apr-2019 15:38:11 + // muellerElement=cfb->getCFCellPtr(fndx,wndx,mNdx[ipol][mRow])->muellerElement_p; build 22-Apr-2019 15:38:11 muellerElement=cfcell->muellerElement_p; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 // cfShape.assign(cfcell->cfShape_p); build 22-Apr-2019 15:38:11 @@ -362,7 +362,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 const Int& spwID, const Int& fieldId) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 //cout << "# " << cfRefFreq << " " << imRefFreq << endl; build 22-Apr-2019 15:38:11 - cerr << pointingOffset << " " << cached_PointingOffset_p << endl; build 22-Apr-2019 15:38:11 + //cerr << pointingOffset << " " << cached_PointingOffset_p << endl; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 if ( build 22-Apr-2019 15:38:11 ((fabs(pointingOffset[0]-cached_PointingOffset_p[0])) > 1e-6) || build 22-Apr-2019 15:38:11 @@ -448,7 +448,8 @@ namespace casa{ build 22-Apr-2019 15:38:11 Complex phasor, nvalue, wt; build 22-Apr-2019 15:38:11 Complex norm; build 22-Apr-2019 15:38:11 Vector cfShape; build 22-Apr-2019 15:38:11 - // cfShape=(*vbRow2CFBMap_p)[0]->getStorage()(0,0,0)->getStorage()->shape().asVector(); build 22-Apr-2019 15:38:11 + // cfShape=(*vb2CFBMap_p)[0]->getStorage()(0,0,0)->getStorage()->shape().asVector(); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 Vector convOrigin;// = (cfShape)/2; build 22-Apr-2019 15:38:11 Double cfRefFreq; build 22-Apr-2019 15:38:11 // Double cfScale=1.0; build 22-Apr-2019 15:38:11 @@ -480,8 +481,8 @@ namespace casa{ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Vector wVals, fVals; PolMapType mVals, mNdx, conjMVals, conjMNdx; build 22-Apr-2019 15:38:11 Double fIncr, wIncr; build 22-Apr-2019 15:38:11 - // CFBuffer& cfb = (*(*vbRow2CFBMap_p)[0]); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + CountedPtr cfb = (*vb2CFBMap_p)[0]; build 22-Apr-2019 15:38:11 + bool finitePointingOffsets=cfb->finitePointingOffsets(); build 22-Apr-2019 15:38:11 // CFBStruct cfbst; build 22-Apr-2019 15:38:11 // cfb.getAsStruct(cfbst); build 22-Apr-2019 15:38:11 // for(int ii=0;ii pointingOffset(cfb.getPointingOffset()); build 22-Apr-2019 15:38:11 + cfb->getCoordList(fVals,wVals,mNdx, mVals, conjMNdx, conjMVals, fIncr, wIncr); build 22-Apr-2019 15:38:11 + // Vector > pointingOffset(cfb.getPointingOffset()); build 22-Apr-2019 15:38:11 // runTimeG1_p += timer_p.real(); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 nw = wVals.nelements(); build 22-Apr-2019 15:38:11 @@ -530,13 +531,6 @@ namespace casa{ build 22-Apr-2019 15:38:11 endChan = nDataChan; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - // Bool finitePointingOffsets=( build 22-Apr-2019 15:38:11 - // (fabs(pointingOffset(0))>0) || build 22-Apr-2019 15:38:11 - // (fabs(pointingOffset(1))>0) build 22-Apr-2019 15:38:11 - // ); build 22-Apr-2019 15:38:11 - // Bool isGridSinglePrecision=(typeid(gridStore[0]) == typeid(wt)); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // Double conjRefFreq = vbs.imRefFreq(); build 22-Apr-2019 15:38:11 Int vbSpw = (vbs.vb_p)->spectralWindows()(0); build 22-Apr-2019 15:38:11 Double vbPA = vbs.paQuant_p.getValue("rad"); build 22-Apr-2019 15:38:11 //Int vbFieldID = -1;//((const Int)((vbs.vb_p)->fieldId()(0))); build 22-Apr-2019 15:38:11 @@ -544,20 +538,12 @@ namespace casa{ build 22-Apr-2019 15:38:11 for(Int irow=rbeg; irow< rend; irow++){ build 22-Apr-2019 15:38:11 // if ((vbs.uvw_p.nelements() == 0)) build 22-Apr-2019 15:38:11 //if (accumCFs) if (allTrue(allPolNChanDone_l)) break; build 22-Apr-2019 15:38:11 - CFBuffer& cfb = *(vb2CFBMap_p->getCFB(0)); build 22-Apr-2019 15:38:11 - setFieldPhaseGrad(vb2CFBMap_p->getCFPhaseGrad(irow)); build 22-Apr-2019 15:38:11 - // if (cached_phaseGrad_p.shape().product()==0) build 22-Apr-2019 15:38:11 - // cerr << "#### " << irow << " " << endl; build 22-Apr-2019 15:38:11 - cfb.getCoordList(fVals,wVals,mNdx, mVals, conjMNdx, conjMVals, fIncr, wIncr); build 22-Apr-2019 15:38:11 - Vector > pointingOffset(cfb.getPointingOffset()); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - Bool finitePointingOffsets=( build 22-Apr-2019 15:38:11 - (fabs(pointingOffset(0)(0))>0) || build 22-Apr-2019 15:38:11 - (fabs(pointingOffset(0)(1))>0) build 22-Apr-2019 15:38:11 - ); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 if(!(*(rowFlag_ptr+irow))) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 + // setFieldPhaseGrad(vb2CFBMap_p->phaseGradCalculator_p->getFieldPointingGrad()); build 22-Apr-2019 15:38:11 + setFieldPhaseGrad(vb2CFBMap_p->getCFPhaseGrad(irow)); build 22-Apr-2019 15:38:11 + cfb = (*vb2CFBMap_p)[irow]; build 22-Apr-2019 15:38:11 for(Int ichan=startChan; ichan< endChan; ichan++) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 if (*(imgWts_ptr + ichan+irow*nDataChan)!=0.0) build 22-Apr-2019 15:38:11 @@ -568,7 +554,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 //timer_p.mark(); build 22-Apr-2019 15:38:11 Double dataWVal = vbs.vb_p->uvw()(2,irow); build 22-Apr-2019 15:38:11 - Int wndx = cfb.nearestWNdx(abs(dataWVal)*freq[ichan]/C::c); build 22-Apr-2019 15:38:11 + Int wndx = cfb->nearestWNdx(abs(dataWVal)*freq[ichan]/C::c); build 22-Apr-2019 15:38:11 // Double conjFreq=sqrt(2*conjRefFreq*conjRefFreq - freq[ichan]*freq[ichan]); build 22-Apr-2019 15:38:11 // Int fndx = cfb.nearestFreqNdx(freq[ichan]), build 22-Apr-2019 15:38:11 // conjFNdx =cfb.nearestFreqNdx(conjFreq); build 22-Apr-2019 15:38:11 @@ -577,7 +563,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 // Int cfFreqNdx; build 22-Apr-2019 15:38:11 // if (vbs.conjBeams_p) cfFreqNdx = cfb.nearestFreqNdx(vbSpw,ichan,true);// Get the conj. freq. index build 22-Apr-2019 15:38:11 // else cfFreqNdx = cfb.nearestFreqNdx(vbSpw,ichan); build 22-Apr-2019 15:38:11 - Int cfFreqNdx = cfb.nearestFreqNdx(vbSpw,ichan,vbs.conjBeams_p); build 22-Apr-2019 15:38:11 + Int cfFreqNdx = cfb->nearestFreqNdx(vbSpw,ichan,vbs.conjBeams_p); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 //runTimeG3_p += timer_p.real(); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -600,7 +586,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 // cfb.getParams(cfRefFreq, s, support(0), support(1),fndx,wndx,0); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 //timer_p.mark(); build 22-Apr-2019 15:38:11 - cfb.getParams(cfRefFreq, s, support(0), support(1),cfFreqNdx,wndx,0); build 22-Apr-2019 15:38:11 + cfb->getParams(cfRefFreq, s, support(0), support(1),cfFreqNdx,wndx,0); build 22-Apr-2019 15:38:11 //runTimeG4_p += timer_p.real(); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 sampling(0) = sampling(1) = SynthesisUtils::nint(s); build 22-Apr-2019 15:38:11 @@ -734,21 +720,20 @@ namespace casa{ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Vector norm(4,0.0); build 22-Apr-2019 15:38:11 Complex phasor, nvalue; build 22-Apr-2019 15:38:11 - Vector cfShape;//=(*vbRow2CFBMap_p)[0]->getStorage()(0,0,0)->getStorage()->shape().asVector(); build 22-Apr-2019 15:38:11 - Vector convOrigin;// = (cfShape)/2; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - Vector >pointingOffset(((*vb2CFBMap_p)[0])->getPointingOffset()); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + CountedPtr cfb=(*vb2CFBMap_p)[0]; build 22-Apr-2019 15:38:11 + Vector cfShape=cfb->getStorage()(0,0,0)->getStorage()->shape().asVector(); build 22-Apr-2019 15:38:11 + Bool finitePointingOffset=cfb->finitePointingOffsets(); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + // Vector convOrigin = (cfShape-1)/2; build 22-Apr-2019 15:38:11 + Vector convOrigin = (cfShape)/2; build 22-Apr-2019 15:38:11 Double cfRefFreq;//cfScale=1.0 build 22-Apr-2019 15:38:11 - // Int wndx = 0, fndx=0; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 rbeg=0; build 22-Apr-2019 15:38:11 rend=vbs.nRow_p; build 22-Apr-2019 15:38:11 rbeg = vbs.beginRow_p; build 22-Apr-2019 15:38:11 rend = vbs.endRow_p; build 22-Apr-2019 15:38:11 nx = grid.shape()[0]; ny = grid.shape()[1]; build 22-Apr-2019 15:38:11 - //nw = cfShape[2]; build 22-Apr-2019 15:38:11 - nGridPol = grid.shape()[2]; nGridChan = grid.shape()[3]; build 22-Apr-2019 15:38:11 + nGridPol = grid.shape()[2]; nGridChan = grid.shape()[3]; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 nDataPol = vbs.flagCube_p.shape()[0]; build 22-Apr-2019 15:38:11 nDataChan = vbs.flagCube_p.shape()[1]; build 22-Apr-2019 15:38:11 @@ -779,60 +764,37 @@ namespace casa{ build 22-Apr-2019 15:38:11 // 1). The last two axis were formerly the W-, and build 22-Apr-2019 15:38:11 // Polarization-axis. build 22-Apr-2019 15:38:11 iloc = 0; build 22-Apr-2019 15:38:11 - Bool finitePointingOffset=( build 22-Apr-2019 15:38:11 - (fabs(pointingOffset(0)(0))>0) || build 22-Apr-2019 15:38:11 - (fabs(pointingOffset(0)(1))>0) build 22-Apr-2019 15:38:11 - ); build 22-Apr-2019 15:38:11 Int vbSpw = (vbs.vb_p)->spectralWindows()(0); build 22-Apr-2019 15:38:11 Double vbPA = vbs.paQuant_p.getValue("rad"); build 22-Apr-2019 15:38:11 // Int vbFieldID = -1;//((const Int)((vbs.vb_p)->fieldId()(0))); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + Vector wVals, fVals; PolMapType mVals, mNdx, conjMVals, conjMNdx; build 22-Apr-2019 15:38:11 + Double fIncr, wIncr; build 22-Apr-2019 15:38:11 + cfb->getCoordList(fVals,wVals,mNdx, mVals, conjMNdx, conjMVals, fIncr, wIncr); build 22-Apr-2019 15:38:11 + nw = wVals.nelements(); build 22-Apr-2019 15:38:11 + // nCFFreq = fVals.nelements()-1; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 for(Int irow=rbeg; irowgetCFB(0)); build 22-Apr-2019 15:38:11 + //setFieldPhaseGrad(vb2CFBMap_p->phaseGradCalculator_p->getFieldPointingGrad()); build 22-Apr-2019 15:38:11 setFieldPhaseGrad(vb2CFBMap_p->getCFPhaseGrad(irow)); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - Vector wVals, fVals; PolMapType mVals, mNdx, conjMVals, conjMNdx; build 22-Apr-2019 15:38:11 - Double fIncr, wIncr; build 22-Apr-2019 15:38:11 - cfb.getCoordList(fVals,wVals,mNdx, mVals, conjMNdx, conjMVals, fIncr, wIncr); build 22-Apr-2019 15:38:11 - nw = wVals.nelements(); build 22-Apr-2019 15:38:11 - // nCFFreq = fVals.nelements()-1; build 22-Apr-2019 15:38:11 + cfb = (*vb2CFBMap_p)[irow]; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 for (Int ichan=0; ichan < nDataChan; ichan++) { build 22-Apr-2019 15:38:11 achan=chanMap_p[ichan]; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 if((achan>=0) && (achanuvw()(2,irow)); build 22-Apr-2019 15:38:11 - Int wndx = cfb.nearestWNdx(abs(dataWVal)*freq[ichan]/C::c); build 22-Apr-2019 15:38:11 - //Int fndx = cfb.nearestFreqNdx(freq[ichan]); build 22-Apr-2019 15:38:11 - Int fndx = cfb.nearestFreqNdx(vbSpw,ichan); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // cerr << "DG: " << fndx << " " << wndx << " " << ichan << " " << vbSpw << " " << freq[ichan] << endl; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // cerr << "Grid: " << ichan << " " << freq[ichan] << " " << fndx << endl; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // if (nw > 1) wndx=SynthesisUtils::nint((dataWVal*freq[ichan]/C::c)/wIncr-1); build 22-Apr-2019 15:38:11 - // if (nCFFreq > 0) fndx = SynthesisUtils::nint((freq[ichan])/fIncr-1); build 22-Apr-2019 15:38:11 + Int wndx = cfb->nearestWNdx(abs(dataWVal)*freq[ichan]/C::c); build 22-Apr-2019 15:38:11 + Int fndx = cfb->nearestFreqNdx(vbSpw,ichan); build 22-Apr-2019 15:38:11 Float s; build 22-Apr-2019 15:38:11 - // CoordinateSystem cs; build 22-Apr-2019 15:38:11 - // cfb.getParams(cs,s,support(0),support(1),0,wndx,0); build 22-Apr-2019 15:38:11 - cfb.getParams(cfRefFreq,s,support(0),support(1),fndx,wndx,0); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + cfb->getParams(cfRefFreq,s,support(0),support(1),fndx,wndx,0); build 22-Apr-2019 15:38:11 sampling(0) = sampling(1) = SynthesisUtils::nint(s); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - //cfScale = cfRefFreq/freq[ichan]; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // sampling[0] = SynthesisUtils::nint(sampling[0]*cfScale); build 22-Apr-2019 15:38:11 - // sampling[1] = SynthesisUtils::nint(sampling[1]*cfScale); build 22-Apr-2019 15:38:11 - // support[0] = SynthesisUtils::nint(support[0]/cfScale); build 22-Apr-2019 15:38:11 - // support[1] = SynthesisUtils::nint(support[1]/cfScale); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 sgrid(pos,loc,off,phasor,irow,uvw,dphase_p[irow],freq[ichan], build 22-Apr-2019 15:38:11 uvwScale_p,offset_p,sampling); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - // iloc[2]=max(0, min(nw, loc[2])); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 Bool isOnGrid; build 22-Apr-2019 15:38:11 // if ((isOnGrid=onGrid(nx, ny, nw, loc, support))) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 @@ -871,7 +833,6 @@ namespace casa{ build 22-Apr-2019 15:38:11 // Set the polarization plane of the gridded data to use for predicting with the CF from mCols column build 22-Apr-2019 15:38:11 visGridElement=(int)(muellerElement%nDataPol); build 22-Apr-2019 15:38:11 igrdpos[2]=polMap_p[visGridElement]; build 22-Apr-2019 15:38:11 - //cerr << "DG: " << mCol << "-->" << visGridElement << "-->" << ipol << " " << polMap_p[ipol] << " " << polMap_p[visGridElement] << endl; build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 // Compute the incrmenets and center pixel for the current CF build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/AWVisResampler.h b/code/synthesis/TransformMachines2/AWVisResampler.h build 22-Apr-2019 15:38:11 index 6c7dff4..2eddfc4 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/AWVisResampler.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/AWVisResampler.h build 22-Apr-2019 15:38:11 @@ -284,14 +284,14 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 // EVLA and ALMA, this is not useful. Leaving it hear for now.... build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 casacore::Bool reindex(const casacore::Vector& in, casacore::Vector& out, build 22-Apr-2019 15:38:11 - const casacore::Double& sinDPA, const casacore::Double& cosDPA, build 22-Apr-2019 15:38:11 - const casacore::Vector& Origin, const casacore::Vector& size); build 22-Apr-2019 15:38:11 + const casacore::Double& sinDPA, const casacore::Double& cosDPA, build 22-Apr-2019 15:38:11 + const casacore::Vector& Origin, const casacore::Vector& size); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - casacore::Complex* getConvFunc_p(const double& vbPA, build 22-Apr-2019 15:38:11 + casacore::Complex* getConvFunc_p(const double& vbPA, build 22-Apr-2019 15:38:11 casacore::Vector& cfShape, build 22-Apr-2019 15:38:11 casacore::Vector& support, build 22-Apr-2019 15:38:11 int& muellerElement, build 22-Apr-2019 15:38:11 - CFBuffer& cfb, build 22-Apr-2019 15:38:11 + CountedPtr& cfb, build 22-Apr-2019 15:38:11 casacore::Double& wVal, casacore::Int& fndx, build 22-Apr-2019 15:38:11 casacore::Int& wndx, build 22-Apr-2019 15:38:11 PolMapType& mNdx, PolMapType& conjMNdx, build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/CFBuffer.cc b/code/synthesis/TransformMachines2/CFBuffer.cc build 22-Apr-2019 15:38:11 index cd579de..21132d4 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/CFBuffer.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/CFBuffer.cc build 22-Apr-2019 15:38:11 @@ -630,16 +630,8 @@ namespace casa{ build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 // st.CFBStorage[i] = (cfstore[i]).operator->()->getStorage()->getStorage(dummy); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - // if (doAlloc) st.pointingOffset=(Double *)malloc(pointingOffset_p.nelements()*sizeof(Double)); build 22-Apr-2019 15:38:11 + // if (doAlloc) st.pointingOffset=(Double *)malloc(pointingOffset_p.nelements()*sizeof(Double)); build 22-Apr-2019 15:38:11 // for (uInt i=0;i0) || build 22-Apr-2019 15:38:11 + (fabs(pointingOffset_p(0)(1))>0)); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 } // end casa namespace build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/CFBuffer.h b/code/synthesis/TransformMachines2/CFBuffer.h build 22-Apr-2019 15:38:11 index c31e853..1abf474 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/CFBuffer.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/CFBuffer.h build 22-Apr-2019 15:38:11 @@ -252,7 +252,7 @@ using namespace casa::vi; build 22-Apr-2019 15:38:11 inline casacore::Int nearestWNdx(const casacore::Double& wVal) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 // return SynthesisUtils::nint(sqrt(wValIncr_p*abs(wVal))); build 22-Apr-2019 15:38:11 - return max(0,min((int)(sqrt(wValIncr_p*abs(wVal))),(int)wValues_p.nelements())-1); build 22-Apr-2019 15:38:11 + return max(0,min((SynthesisUtils::nint)(sqrt(wValIncr_p*abs(wVal))),(int)wValues_p.nelements())-1); build 22-Apr-2019 15:38:11 // Int ndx=(int)(sqrt(wValIncr_p*abs(wVal))); build 22-Apr-2019 15:38:11 // if ((uInt)ndx >= wValues_p.nelements()) build 22-Apr-2019 15:38:11 // cerr << endl << endl << ndx << " " << wVal << " " << wValIncr_p << endl << endl; build 22-Apr-2019 15:38:11 @@ -326,9 +326,9 @@ using namespace casa::vi; build 22-Apr-2019 15:38:11 const casacore::Float& diameter=25.0); build 22-Apr-2019 15:38:11 // casacore::RigidVector setParams(const casacore::Int& inu, const casacore::Int& iw, const casacore::Int& muellerElement, build 22-Apr-2019 15:38:11 // const casacore::TableRecord& miscInfo); build 22-Apr-2019 15:38:11 - void setPointingOffset(const casacore::Vector > & offset) build 22-Apr-2019 15:38:11 + void setPointingOffset(const casacore::Vector >& offset) build 22-Apr-2019 15:38:11 {pointingOffset_p.assign(offset);}; build 22-Apr-2019 15:38:11 - casacore::Vector >getPointingOffset() {return pointingOffset_p;}; build 22-Apr-2019 15:38:11 + casacore::Vector > getPointingOffset() {return pointingOffset_p;}; build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 // Also set the size of the CF in x and y. build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 @@ -408,6 +408,7 @@ using namespace casa::vi; build 22-Apr-2019 15:38:11 casacore::IPosition getShape() {return cfCells_p.shape();} build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 int getMaxCFSize(); build 22-Apr-2019 15:38:11 + bool finitePointingOffsets(); build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //============================= Protected Parts ============================ build 22-Apr-2019 15:38:11 //------------------------------------------------------------------ build 22-Apr-2019 15:38:11 @@ -426,7 +427,7 @@ using namespace casa::vi; build 22-Apr-2019 15:38:11 MuellerMatrixType muellerMask_p; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 casacore::Int nPol_p, nChan_p, nW_p, maxXSupport_p, maxYSupport_p; build 22-Apr-2019 15:38:11 - casacore::Vector >pointingOffset_p; build 22-Apr-2019 15:38:11 + casacore::Vector > pointingOffset_p; build 22-Apr-2019 15:38:11 casacore::Cube cfHitsStats; build 22-Apr-2019 15:38:11 casacore::Bool freqNdxMapsReady_p; build 22-Apr-2019 15:38:11 casacore::Vector > freqNdxMap_p, conjFreqNdxMap_p; build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/ConvolutionFunction.h b/code/synthesis/TransformMachines2/ConvolutionFunction.h build 22-Apr-2019 15:38:11 index 3b9b544..3a92052 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/ConvolutionFunction.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/ConvolutionFunction.h build 22-Apr-2019 15:38:11 @@ -144,10 +144,8 @@ namespace casa{ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 // virtual void setFeedStokes(const casacore::Vector& feedStokes) = 0; build 22-Apr-2019 15:38:11 virtual casacore::Bool findSupport(casacore::Array& func, casacore::Float& threshold,casacore::Int& origin, casacore::Int& R)=0; build 22-Apr-2019 15:38:11 - /* virtual casacore::Vector findPointingOffset(const casacore::ImageInterface& image, */ build 22-Apr-2019 15:38:11 - /* const VisBuffer2& vb, const casacore::Bool& doPointing) = 0; */ build 22-Apr-2019 15:38:11 - virtual casacore::Vector > findPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 - const VisBuffer2& vb, const casacore::Bool& doPointing) = 0; build 22-Apr-2019 15:38:11 + virtual casacore::Vector findPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 + const VisBuffer2& vb) = 0; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 // virtual void setParams(const casacore::Vector& polMap, const casacore::Vector& feedStokes) build 22-Apr-2019 15:38:11 // {setPolMap(polMap); setFeedStokes(feedStokes);}; build 22-Apr-2019 15:38:11 @@ -161,6 +159,12 @@ namespace casa{ build 22-Apr-2019 15:38:11 virtual void setPointingOffsets(const casacore::CountedPtr& po){po_p=po;}; build 22-Apr-2019 15:38:11 virtual casacore::CountedPtr getTerm(const casacore::String& /*name*/) {return NULL;} build 22-Apr-2019 15:38:11 virtual int getOversampling(){return 1;}; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + virtual casacore::Vector > findPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 + const VisBuffer2& vb, const casacore::Bool& doPointing) = 0; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 private: build 22-Apr-2019 15:38:11 casacore::Int nDim; build 22-Apr-2019 15:38:11 protected: build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/IlluminationConvFunc.h b/code/synthesis/TransformMachines2/IlluminationConvFunc.h build 22-Apr-2019 15:38:11 index 46db718..63e6e3d 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/IlluminationConvFunc.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/IlluminationConvFunc.h build 22-Apr-2019 15:38:11 @@ -99,10 +99,8 @@ namespace casa{ build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 casacore::Bool findSupport(casacore::Array&, casacore::Float& ,casacore::Int&, casacore::Int&) build 22-Apr-2019 15:38:11 {throw(casacore::AipsError("IlluminationConvFunc::findSupport() not implemented"));}; build 22-Apr-2019 15:38:11 - /* virtual casacore::Vector findPointingOffset(const casacore::ImageInterface& /\*image*\/, */ build 22-Apr-2019 15:38:11 - /* const VisBuffer2& /\*vb*\/, const casacore::Bool& /\*doPointing*\/) */ build 22-Apr-2019 15:38:11 - virtual casacore::Vector< casacore::Vector > findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 - const VisBuffer2& /*vb*/, const casacore::Bool& /*doPointing*/) build 22-Apr-2019 15:38:11 + virtual casacore::Vector findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 + const VisBuffer2& /*vb*/) build 22-Apr-2019 15:38:11 {throw(casacore::AipsError("IlluminationConvFunc::findPointingOffset() not implemented"));}; build 22-Apr-2019 15:38:11 //virtual void prepareConvFunction(const VisBuffer2& /*vb*/, VBRow2CFBMapType& /*theMap*/) build 22-Apr-2019 15:38:11 virtual void prepareConvFunction(const VisBuffer2& /*vb*/, VB2CFBMap& /*theMap*/) build 22-Apr-2019 15:38:11 @@ -121,6 +119,10 @@ namespace casa{ build 22-Apr-2019 15:38:11 {throw(casacore::AipsError("IlluminationConvFunc::makeAverageRes() called"));}; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 + virtual casacore::Vector< casacore::Vector > findPointingOffset(const casacore::ImageInterface& /*image*/, build 22-Apr-2019 15:38:11 + const VisBuffer2& /*vb*/, const casacore::Bool& /*doPointing*/) build 22-Apr-2019 15:38:11 + {throw(casacore::AipsError("IlluminationConvFunc::findPointingOffset() not implemented"));}; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 private: build 22-Apr-2019 15:38:11 ExpCache ExpTable; build 22-Apr-2019 15:38:11 CExp3 CExpTable; build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/PhaseGrad.cc b/code/synthesis/TransformMachines2/PhaseGrad.cc build 22-Apr-2019 15:38:11 index b9aceda..f188e61 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/PhaseGrad.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/PhaseGrad.cc build 22-Apr-2019 15:38:11 @@ -45,16 +45,30 @@ namespace casa{ build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 field_phaseGrad_p = other.field_phaseGrad_p; build 22-Apr-2019 15:38:11 antenna_phaseGrad_p = other.antenna_phaseGrad_p; build 22-Apr-2019 15:38:11 - // cached_FieldOffset_p[0] = other.cached_FieldOffset_p[0]; build 22-Apr-2019 15:38:11 - // cached_FieldOffset_p[1] = other.cached_FieldOffset_p[1]; build 22-Apr-2019 15:38:11 - // cached_AntennaOffset_p[0] = other.cached_AntennaOffset_p[0]; build 22-Apr-2019 15:38:11 - // cached_AntennaOffset_p[1] = other.cached_AntennaOffset_p[1]; build 22-Apr-2019 15:38:11 + cached_FieldOffset_p = other.cached_FieldOffset_p; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 return *this; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 + bool PhaseGrad::needsNewPhaseGrad(const Vector >& pointingOffset, build 22-Apr-2019 15:38:11 + const VisBuffer2& vb, build 22-Apr-2019 15:38:11 + const int& row) build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + unsigned int nRow=vb.nRows(); build 22-Apr-2019 15:38:11 + if (cached_FieldOffset_p.nelements() < nRow) cached_FieldOffset_p.resize(nRow,true); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + return ( build 22-Apr-2019 15:38:11 + ((fabs(pointingOffset[row][0]-cached_FieldOffset_p[row](0))) > 1e-12) || build 22-Apr-2019 15:38:11 + ((fabs(pointingOffset[row][1]-cached_FieldOffset_p[row](1))) > 1e-12) || build 22-Apr-2019 15:38:11 + (field_phaseGrad_p.shape()[0] < maxCFShape_p[0]) || build 22-Apr-2019 15:38:11 + (field_phaseGrad_p.shape()[1] < maxCFShape_p[1]) build 22-Apr-2019 15:38:11 + ); build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + // build 22-Apr-2019 15:38:11 + //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 + // build 22-Apr-2019 15:38:11 // bool PhaseGrad::ComputeFieldPointingGrad(const Vector& pointingOffset, build 22-Apr-2019 15:38:11 // const CountedPtr& cfb, build 22-Apr-2019 15:38:11 // const Vector&cfShape, build 22-Apr-2019 15:38:11 @@ -64,7 +78,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 // const int& spwID, const int& fieldId) build 22-Apr-2019 15:38:11 bool PhaseGrad::ComputeFieldPointingGrad(const Vector >& pointingOffset, build 22-Apr-2019 15:38:11 const CountedPtr& cfb, build 22-Apr-2019 15:38:11 - const VisBuffer2& ,//vb build 22-Apr-2019 15:38:11 + const VisBuffer2& vb, build 22-Apr-2019 15:38:11 const int& row build 22-Apr-2019 15:38:11 ) build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -76,30 +90,32 @@ namespace casa{ build 22-Apr-2019 15:38:11 if (thisCFB != cachedCFBPtr_p) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 maxCFShape_p[0] = maxCFShape_p[1] = cfb->getMaxCFSize(); build 22-Apr-2019 15:38:11 - // { build 22-Apr-2019 15:38:11 - // // LogIO log_l(LogOrigin("PhaseGrad","computeFieldPointingGrad")); build 22-Apr-2019 15:38:11 - // cerr << "CFB changed: "<< thisCFB << " " << cachedCFBPtr_p << " " << vb.spectralWindows()(0) << " " << vb.fieldId()(0) << " " << maxCFShape_p << endl; build 22-Apr-2019 15:38:11 - // } build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + // LogIO log_l(LogOrigin("PhaseGrad","computeFieldPointingGrad")); build 22-Apr-2019 15:38:11 + //cerr << "CFB changed: "<< thisCFB << " " << cachedCFBPtr_p << " " << vb.spectralWindows()(0) << " " << vb.fieldId()(0) << " " << maxCFShape_p << endl; build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 cachedCFBPtr_p = thisCFB; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 // If the pointing or the max. CF size changed, recompute the phase gradient. build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 - if ( build 22-Apr-2019 15:38:11 - ((fabs(pointingOffset[row][0]-cached_FieldOffset_p[0])) > 1e-6) || build 22-Apr-2019 15:38:11 - ((fabs(pointingOffset[row][1]-cached_FieldOffset_p[1])) > 1e-6) || build 22-Apr-2019 15:38:11 - (field_phaseGrad_p.shape()[0] < maxCFShape_p[0]) || build 22-Apr-2019 15:38:11 - (field_phaseGrad_p.shape()[1] < maxCFShape_p[1]) build 22-Apr-2019 15:38:11 - ) build 22-Apr-2019 15:38:11 + if (needsNewPhaseGrad(pointingOffset, vb, row)) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 + LogIO log_l(LogOrigin("PhaseGrad","computeFieldPointingGrad")); build 22-Apr-2019 15:38:11 + log_l << "Computing Phase Grad: " << row << " " << pointingOffset[row][0] << " " << pointingOffset[row][1] << " " << cached_FieldOffset_p[row](0) << " " build 22-Apr-2019 15:38:11 + << cached_FieldOffset_p[row](1) << " " << field_phaseGrad_p.shape() << " " << maxCFShape_p[0] << " " build 22-Apr-2019 15:38:11 + << cached_FieldOffset_p.nelements() build 22-Apr-2019 15:38:11 + << LogIO::POST; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 int nx=maxCFShape_p(0), ny=maxCFShape_p(1); build 22-Apr-2019 15:38:11 double grad; build 22-Apr-2019 15:38:11 Complex phx,phy; build 22-Apr-2019 15:38:11 Vector convOrigin = maxCFShape_p/2; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 field_phaseGrad_p.resize(nx,ny); build 22-Apr-2019 15:38:11 - cached_FieldOffset_p[0] = pointingOffset[row][0]; build 22-Apr-2019 15:38:11 - cached_FieldOffset_p[1] = pointingOffset[row][1]; build 22-Apr-2019 15:38:11 + cached_FieldOffset_p[row] = pointingOffset[row]; build 22-Apr-2019 15:38:11 + // cached_FieldOffset_p[row](0) = pointingOffset[row][0]; build 22-Apr-2019 15:38:11 + // cached_FieldOffset_p[row](1) = pointingOffset[row][1]; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 for(int ix=0;ix& getFieldPointingGrad() {return field_phaseGrad_p;} build 22-Apr-2019 15:38:11 inline const casacore::Matrix& getAntennaPointingGrad() {return antenna_phaseGrad_p;} build 22-Apr-2019 15:38:11 + bool needsNewPhaseGrad(const casacore::Vector >& pointingOffset, build 22-Apr-2019 15:38:11 + const vi::VisBuffer2& vb, build 22-Apr-2019 15:38:11 + const int& row); build 22-Apr-2019 15:38:11 // void getPhaseGrad(casacore::Matrix& fullPhaseGrad) {fullPhaseGrad = antenna_phaseGrad_p + sky_phaseGrad_p;} build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 bool ComputeFieldPointingGrad(const casacore::Vector& pointingOffset, build 22-Apr-2019 15:38:11 @@ -67,7 +70,6 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 const casacore::CountedPtr& cfb, build 22-Apr-2019 15:38:11 const vi::VisBuffer2& vb, build 22-Apr-2019 15:38:11 const int& row); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 // bool ComputeFieldPointingGrad(const casacore::Vector& pointingOffset, build 22-Apr-2019 15:38:11 // const casacore::Vector&cfShape, build 22-Apr-2019 15:38:11 // const casacore::Vector& convOrigin, build 22-Apr-2019 15:38:11 @@ -78,7 +80,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 // private: build 22-Apr-2019 15:38:11 casacore::Matrix field_phaseGrad_p; build 22-Apr-2019 15:38:11 casacore::Matrix antenna_phaseGrad_p; build 22-Apr-2019 15:38:11 - casacore::Double cached_FieldOffset_p[2], cached_AntennaOffset_p[2]; build 22-Apr-2019 15:38:11 + casacore::Vector > cached_FieldOffset_p; build 22-Apr-2019 15:38:11 CFBuffer* cachedCFBPtr_p; build 22-Apr-2019 15:38:11 casacore::Vector maxCFShape_p; build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/PointingOffsets.cc b/code/synthesis/TransformMachines2/PointingOffsets.cc build 22-Apr-2019 15:38:11 index 20e019a..1cb00ec 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/PointingOffsets.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/PointingOffsets.cc build 22-Apr-2019 15:38:11 @@ -27,14 +27,14 @@ build 22-Apr-2019 15:38:11 //# $Id$ build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +// #include build 22-Apr-2019 15:38:11 +// #include build 22-Apr-2019 15:38:11 +// #include build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 using namespace casacore; build 22-Apr-2019 15:38:11 namespace casa{ build 22-Apr-2019 15:38:11 @@ -49,98 +49,93 @@ namespace casa{ build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 imageDC_p = other.imageDC_p; build 22-Apr-2019 15:38:11 imageObsInfo_p = other.imageObsInfo_p; build 22-Apr-2019 15:38:11 - doPointing_p = other.doPointing_p; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 return *this; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 - casacore::Vector >PointingOffsets::findMosaicPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 - const VisBuffer2& vb, const casacore::Bool& doPointing) build 22-Apr-2019 15:38:11 + Vector >PointingOffsets::findMosaicPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 + const VisBuffer2& vb, const Bool& doPointing) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - VisBufferUtil vbUtils; build 22-Apr-2019 15:38:11 - //cerr << "#######: Using Mosaic Field pointing offsets" < >pixFieldGrad_l; build 22-Apr-2019 15:38:11 + Vector >pixFieldGrad_l; build 22-Apr-2019 15:38:11 pixFieldGrad_l.resize(1); build 22-Apr-2019 15:38:11 - MDirection dir = vbUtils.getPointingDir(vb,antId,numRow,doPointing); build 22-Apr-2019 15:38:11 - //cerr << "VBDir: " << dir<< endl; build 22-Apr-2019 15:38:11 + MDirection dir = vbUtils_p.getPointingDir(vb,antId,numRow,dc_p.directionType(),doPointing); build 22-Apr-2019 15:38:11 thePix_p = toPix(vb, dir, dir); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 pixFieldGrad_p = gradPerPixel(thePix_p); build 22-Apr-2019 15:38:11 - // MDirection fieldDir=direction1_p; build 22-Apr-2019 15:38:11 - //shift from center build 22-Apr-2019 15:38:11 - //pixFieldGrad_p(0) = pixFieldGrad_p(0) - double(nx_p / 2); build 22-Apr-2019 15:38:11 - //pixFieldGrad_p(1) = pixFieldGrad_p(1) - double(ny_p / 2); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - //Int convSampling=getOversampling(*psTerm_p,*wTerm_p,*aTerm_p); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - //phase gradient per pixel to apply build 22-Apr-2019 15:38:11 - //pixFieldGrad_p(0) = -pixFieldGrad_p(0)*2.0*C::pi/double(nx_p)/double(convOversampling_p); build 22-Apr-2019 15:38:11 - //pixFieldGrad_p(1) = -pixFieldGrad_p(1)*2.0*C::pi/double(ny_p)/double(convOversampling_p); build 22-Apr-2019 15:38:11 pixFieldGrad_l(0)=(pixFieldGrad_p); build 22-Apr-2019 15:38:11 - //pixFieldGrad_l(1)=(pixFieldGrad_p); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 return pixFieldGrad_l; build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //---------------------------------------------------------------------- build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 - casacore::Vector > PointingOffsets::findAntennaPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 - const vi::VisBuffer2& vb, const casacore::Bool& doPointing) build 22-Apr-2019 15:38:11 + Vector > PointingOffsets::findAntennaPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 + const vi::VisBuffer2& vb, const Bool& doPointing) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - casacore::Vector< casacore::Vector >antOffsets; build 22-Apr-2019 15:38:11 + Vector >antOffsets; build 22-Apr-2019 15:38:11 storeImageParams(image,vb); build 22-Apr-2019 15:38:11 - VisBufferUtil vbUtils; build 22-Apr-2019 15:38:11 - const casacore::Vector& antID1 = vb.antenna1(); build 22-Apr-2019 15:38:11 - const casacore::Vector& antID2 = vb.antenna2(); build 22-Apr-2019 15:38:11 - int numRow_p = vb.nRows(); build 22-Apr-2019 15:38:11 - antOffsets.resize(numRow_p); // The array is resized to fit for a given vb build 22-Apr-2019 15:38:11 - for (int irow=0; irow thePixDir1_l, thePixDir2_l; build 22-Apr-2019 15:38:11 - thePixDir1_l = toPix(vb, antDir1, vbdir); build 22-Apr-2019 15:38:11 - thePixDir2_l = toPix(vb, antDir2, vbdir); build 22-Apr-2019 15:38:11 - thePix_p = (thePixDir1_l + thePixDir2_l)/2.; build 22-Apr-2019 15:38:11 - antOffsets(irow) = gradPerPixel(thePix_p); build 22-Apr-2019 15:38:11 - //cerr<<"Antenna 1:"< thePixDir1_l, thePixDir2_l; build 22-Apr-2019 15:38:11 + thePixDir1_l = toPix(vb, antDir1, antDir2); build 22-Apr-2019 15:38:11 + thePixDir2_l = toPix(vb, antDir2, antDir1); build 22-Apr-2019 15:38:11 + thePix_p = (thePixDir1_l + thePixDir2_l)/2.; build 22-Apr-2019 15:38:11 + antOffsets(irow) = gradPerPixel(thePix_p); build 22-Apr-2019 15:38:11 + if (PO_DEBUG_P==1) build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + cerr << irow << " " build 22-Apr-2019 15:38:11 + << vb.antenna1()[irow] << " " << vb.antenna2()[irow] << " " build 22-Apr-2019 15:38:11 + << antDir1 << " " << antDir2 << " " build 22-Apr-2019 15:38:11 + << vb.direction1()(irow) << " " << vb.direction2()(irow) << " " build 22-Apr-2019 15:38:11 + << toPix(vb, antDir1, antDir2) << " " << toPix(vb, antDir2,antDir1) build 22-Apr-2019 15:38:11 + << endl; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + //cerr << irow << " " << antOffsets[irow]<< endl; build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + if (PO_DEBUG_P==1) build 22-Apr-2019 15:38:11 + cerr << "=========================================================================" << endl; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - // int antId,numRow; build 22-Apr-2019 15:38:11 - // antId = 0; build 22-Apr-2019 15:38:11 - // numRow = 0; build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - // MDirection antDir =vbUtils.getPointingDir(vb, antId, numRow, doPointing); build 22-Apr-2019 15:38:11 - // //cerr << "AntDir="< > PointingOffsets::findPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 + const VisBuffer2& vb, const Bool doPointing) build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + setDoPointing(doPointing); build 22-Apr-2019 15:38:11 + if (!doPointing) build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + return findMosaicPointingOffset(image,vb,doPointing); build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 + else build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + return findAntennaPointingOffset(image,vb,doPointing); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - //cerr<<"Antenna offset :"< > PointingOffsets::findPointingOffset(const ImageInterface& image, build 22-Apr-2019 15:38:11 - const VisBuffer2& vb, const Bool doPointing) build 22-Apr-2019 15:38:11 - { build 22-Apr-2019 15:38:11 - setDoPointing(doPointing); build 22-Apr-2019 15:38:11 - if (!doPointing) build 22-Apr-2019 15:38:11 - { build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - return findMosaicPointingOffset(image,vb,doPointing); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - } build 22-Apr-2019 15:38:11 - else build 22-Apr-2019 15:38:11 - { build 22-Apr-2019 15:38:11 - return findAntennaPointingOffset(image,vb,doPointing); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - } build 22-Apr-2019 15:38:11 - } build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - void PointingOffsets::storeImageParams(const casacore::ImageInterface& iimage, build 22-Apr-2019 15:38:11 + void PointingOffsets::storeImageParams(const ImageInterface& iimage, build 22-Apr-2019 15:38:11 const VisBuffer2& vb) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 //image signature changed...rather simplistic for now build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/PointingOffsets.h b/code/synthesis/TransformMachines2/PointingOffsets.h build 22-Apr-2019 15:38:11 index 2cba85d..b68bdd9 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/PointingOffsets.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/PointingOffsets.h build 22-Apr-2019 15:38:11 @@ -29,11 +29,13 @@ build 22-Apr-2019 15:38:11 #ifndef SYNTHESIS_TRANSFORM2_POINTINGOFFSETS_H build 22-Apr-2019 15:38:11 #define SYNTHESIS_TRANSFORM2_POINTINGOFFSETS_H build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -#include build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 class SolvableVisJones; build 22-Apr-2019 15:38:11 namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 @@ -44,7 +46,12 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 class PointingOffsets build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 public: build 22-Apr-2019 15:38:11 - PointingOffsets(const int& convOversampling):epJ_p(),doPointing_p(false) {convOversampling_p = convOversampling;} build 22-Apr-2019 15:38:11 + PointingOffsets(const int& convOversampling):epJ_p(), doPointing_p(false),vbUtils_p() build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + convOversampling_p = convOversampling; build 22-Apr-2019 15:38:11 + PO_DEBUG_P = SynthesisUtils::getenv("PO_DEBUG",0); build 22-Apr-2019 15:38:11 + cerr << "PO_DEBUG = " << PO_DEBUG_P << endl; build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 ~PointingOffsets() {}; build 22-Apr-2019 15:38:11 PointingOffsets& operator=(const PointingOffsets& other); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -58,14 +65,13 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 virtual casacore::Vector >findPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 const vi::VisBuffer2& vb, const casacore::Bool doPointing=false); build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - //casacore::Vector findPointingOffset(const casacore::ImageInterface& image, build 22-Apr-2019 15:38:11 - // const vi::VisBuffer2& vb); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 casacore::Vector gradPerPixel(const casacore::Vector& p); build 22-Apr-2019 15:38:11 casacore::Vector& toPix(const vi::VisBuffer2& vb, build 22-Apr-2019 15:38:11 const casacore::MDirection& dir1, const casacore::MDirection& dir2); build 22-Apr-2019 15:38:11 void storeImageParams(const casacore::ImageInterface& iimage, const vi::VisBuffer2& vb); build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 void setDoPointing(const bool& dop=false) {doPointing_p = dop;} build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 private: build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 casacore::Vector thePix_p, pixFieldGrad_p; build 22-Apr-2019 15:38:11 @@ -82,6 +88,9 @@ namespace casa { //# NAMESPACE CASA - BEGIN build 22-Apr-2019 15:38:11 casacore::MDirection direction2_p; build 22-Apr-2019 15:38:11 casacore::CountedPtr epJ_p; build 22-Apr-2019 15:38:11 bool doPointing_p; build 22-Apr-2019 15:38:11 + VisBufferUtil vbUtils_p; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 + int PO_DEBUG_P; build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 //------------------------------------------------------------------------------------------- build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/SimplePBConvFunc.cc b/code/synthesis/TransformMachines2/SimplePBConvFunc.cc build 22-Apr-2019 15:38:11 index 3630deb..b475314 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/SimplePBConvFunc.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/SimplePBConvFunc.cc build 22-Apr-2019 15:38:11 @@ -80,29 +80,32 @@ SimplePBConvFunc::SimplePBConvFunc(): nchan_p(-1), build 22-Apr-2019 15:38:11 npol_p(-1), pointToPix_p(), directionIndex_p(-1), thePix_p(0), build 22-Apr-2019 15:38:11 filledFluxScale_p(false),doneMainConv_p(0), build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - calcFluxScale_p(true), convFunctionMap_p(-1), actualConvIndex_p(-1), convSize_p(0), convSupport_p(0), pointingPix_p(), usePointingTable_p(False) { build 22-Apr-2019 15:38:11 + calcFluxScale_p(true), convFunctionMap_p(-1), actualConvIndex_p(-1), convSize_p(0), convSupport_p(0), pointingPix_p() { build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 pbClass_p=PBMathInterface::COMMONPB; build 22-Apr-2019 15:38:11 ft_p=FFT2D(true); build 22-Apr-2019 15:38:11 + usePointingTable_p=False; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 SimplePBConvFunc::SimplePBConvFunc(const PBMathInterface::PBClass typeToUse): build 22-Apr-2019 15:38:11 nchan_p(-1),npol_p(-1),pointToPix_p(), build 22-Apr-2019 15:38:11 directionIndex_p(-1), thePix_p(0), filledFluxScale_p(false),doneMainConv_p(0), build 22-Apr-2019 15:38:11 - calcFluxScale_p(true), convFunctionMap_p(-1), actualConvIndex_p(-1), convSize_p(0), convSupport_p(0), pointingPix_p(), usePointingTable_p(False) { build 22-Apr-2019 15:38:11 + calcFluxScale_p(true), convFunctionMap_p(-1), actualConvIndex_p(-1), convSize_p(0), convSupport_p(0), pointingPix_p() { build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 pbClass_p=typeToUse; build 22-Apr-2019 15:38:11 ft_p=FFT2D(true); build 22-Apr-2019 15:38:11 + usePointingTable_p=False; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 SimplePBConvFunc::SimplePBConvFunc(const RecordInterface& rec, const Bool calcfluxneeded) build 22-Apr-2019 15:38:11 : nchan_p(-1),npol_p(-1),pointToPix_p(), directionIndex_p(-1), thePix_p(0), filledFluxScale_p(false), build 22-Apr-2019 15:38:11 doneMainConv_p(0), build 22-Apr-2019 15:38:11 - calcFluxScale_p(calcfluxneeded), convFunctionMap_p(-1), actualConvIndex_p(-1), convSize_p(0), convSupport_p(0), pointingPix_p(), usePointingTable_p(False) build 22-Apr-2019 15:38:11 + calcFluxScale_p(calcfluxneeded), convFunctionMap_p(-1), actualConvIndex_p(-1), convSize_p(0), convSupport_p(0), pointingPix_p() build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 String err; build 22-Apr-2019 15:38:11 fromRecord(err, rec, calcfluxneeded); build 22-Apr-2019 15:38:11 ft_p=FFT2D(true); build 22-Apr-2019 15:38:11 + usePointingTable_p=False; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 SimplePBConvFunc::~SimplePBConvFunc(){ build 22-Apr-2019 15:38:11 // build 22-Apr-2019 15:38:11 @@ -131,7 +134,8 @@ SimplePBConvFunc::SimplePBConvFunc(): nchan_p(-1), build 22-Apr-2019 15:38:11 Int ant1=vb.antenna1()(0); build 22-Apr-2019 15:38:11 pos=vb.subtableColumns().antenna().positionMeas()(ant1); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - //cout << "TELESCOPE " << tel << endl; build 22-Apr-2019 15:38:11 + imInfo.setTelescope(tel); build 22-Apr-2019 15:38:11 + csys_p.setObsInfo(imInfo); build 22-Apr-2019 15:38:11 //Store this to build epochs via the time access of visbuffer later build 22-Apr-2019 15:38:11 timeMType_p=MEpoch::castType(mscol.timeMeas()(0).getRef().getType()); build 22-Apr-2019 15:38:11 timeUnit_p=Unit(mscol.timeMeas().measDesc().getUnits()(0).getName()); build 22-Apr-2019 15:38:11 @@ -271,7 +275,7 @@ SimplePBConvFunc::SimplePBConvFunc(): nchan_p(-1), build 22-Apr-2019 15:38:11 ant1PointingCache_p.resize(val+1, true); build 22-Apr-2019 15:38:11 if(hasValidPointing){ build 22-Apr-2019 15:38:11 //ant1PointingCache_p[val]=vb.direction1()[0]; build 22-Apr-2019 15:38:11 - ant1PointingCache_p[val]=vbUtil_p.getPointingDir(vb, vb.antenna1()(0), 0, usePointingTable_p); build 22-Apr-2019 15:38:11 + ant1PointingCache_p[val]=vbutil_p->getPointingDir(vb, vb.antenna1()(0), 0, dc_p.directionType()); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 else build 22-Apr-2019 15:38:11 ant1PointingCache_p[val]=vbutil_p->getPhaseCenter(vb); build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/SimplePBConvFunc.h b/code/synthesis/TransformMachines2/SimplePBConvFunc.h build 22-Apr-2019 15:38:11 index 35c463a..3509f5e 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/SimplePBConvFunc.h build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/SimplePBConvFunc.h build 22-Apr-2019 15:38:11 @@ -175,6 +175,7 @@ namespace refim{ //namespace for imaging refactor build 22-Apr-2019 15:38:11 casacore::CountedPtr > convWeightImage_p; build 22-Apr-2019 15:38:11 casacore::String bandName_p; build 22-Apr-2019 15:38:11 casacore::CountedPtr vbutil_p; build 22-Apr-2019 15:38:11 + casacore::Bool usePointingTable_p; build 22-Apr-2019 15:38:11 private: build 22-Apr-2019 15:38:11 casacore::Bool checkPBOfField(const vi::VisBuffer2& vb); build 22-Apr-2019 15:38:11 void addPBToFlux(const vi::VisBuffer2& vb); build 22-Apr-2019 15:38:11 @@ -195,8 +196,7 @@ namespace refim{ //namespace for imaging refactor build 22-Apr-2019 15:38:11 casacore::Block > > convSizes_p; build 22-Apr-2019 15:38:11 casacore::Block > > convSupportBlock_p; build 22-Apr-2019 15:38:11 casacore::Matrix pointingPix_p; build 22-Apr-2019 15:38:11 - VisBufferUtil vbUtil_p; build 22-Apr-2019 15:38:11 - casacore::Bool usePointingTable_p; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 }; //end of refim namespace build 22-Apr-2019 15:38:11 };// end of namespace build 22-Apr-2019 15:38:11 diff --git a/code/synthesis/TransformMachines2/VB2CFBMap.cc b/code/synthesis/TransformMachines2/VB2CFBMap.cc build 22-Apr-2019 15:38:11 index 0405782..ee1e3df 100644 build 22-Apr-2019 15:38:11 --- a/code/synthesis/TransformMachines2/VB2CFBMap.cc build 22-Apr-2019 15:38:11 +++ b/code/synthesis/TransformMachines2/VB2CFBMap.cc build 22-Apr-2019 15:38:11 @@ -35,17 +35,20 @@ build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 +#include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 #include build 22-Apr-2019 15:38:11 -using namespace casacore; build 22-Apr-2019 15:38:11 namespace casa{ build 22-Apr-2019 15:38:11 - using namespace vi; build 22-Apr-2019 15:38:11 +using namespace vi; build 22-Apr-2019 15:38:11 namespace refim{ build 22-Apr-2019 15:38:11 + Int mapAntIDToAntType(const casacore::Int& /*ant*/) {return 0;}; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 VB2CFBMap::VB2CFBMap(): vb2CFBMap_p(), cfPhaseGrad_p(), phaseGradCalculator_p(),doPointing_p(false) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 phaseGradCalculator_p = new PhaseGrad(); build 22-Apr-2019 15:38:11 + newPhaseGradComputed_p = false; build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 VB2CFBMap& VB2CFBMap::operator=(const VB2CFBMap& other) build 22-Apr-2019 15:38:11 @@ -54,7 +57,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 phaseGradCalculator_p = other.phaseGradCalculator_p; build 22-Apr-2019 15:38:11 cfPhaseGrad_p.assign(other.cfPhaseGrad_p); build 22-Apr-2019 15:38:11 - vb2CFBMap_p.assign(vb2CFBMap_p); build 22-Apr-2019 15:38:11 + vb2CFBMap_p.assign(other.vb2CFBMap_p); build 22-Apr-2019 15:38:11 doPointing_p = other.doPointing_p; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 return *this; build 22-Apr-2019 15:38:11 @@ -65,23 +68,22 @@ namespace casa{ build 22-Apr-2019 15:38:11 const vi::VisBuffer2& vb, build 22-Apr-2019 15:38:11 const int& row) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - //if (phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb)) build 22-Apr-2019 15:38:11 if (doPointing_p) build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb, row); build 22-Apr-2019 15:38:11 + if (phaseGradCalculator_p->needsNewPhaseGrad(pointingOffset, vb, 0)) build 22-Apr-2019 15:38:11 + { build 22-Apr-2019 15:38:11 + phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb, 0); build 22-Apr-2019 15:38:11 + newPhaseGradComputed_p=true; build 22-Apr-2019 15:38:11 + } build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 else build 22-Apr-2019 15:38:11 { build 22-Apr-2019 15:38:11 phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb, 0); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - //cerr<<"doPointing VB2CFBMap::sPGPR: "<<<getFieldPointingGrad()); build 22-Apr-2019 15:38:11 + //cfPhaseGrad_p(row).assign(phaseGradCalculator_p->getFieldPointingGrad()); build 22-Apr-2019 15:38:11 + cfPhaseGrad_p(row).reference(phaseGradCalculator_p->field_phaseGrad_p); build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 - // visResampler_p->setFieldPhaseGrad(phaseGradCalculator_p.getFieldPointingGrad()); build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Int VB2CFBMap::makeVBRow2CFBMap(CFStore2& cfs, build 22-Apr-2019 15:38:11 @@ -103,6 +105,7 @@ namespace casa{ build 22-Apr-2019 15:38:11 Quantity pa(getPA(vb),"rad"); build 22-Apr-2019 15:38:11 //PolOuterProduct outerProduct; build 22-Apr-2019 15:38:11 Int statusCode=CFDefs::MEMCACHE; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 for (Int irow=0;irow& dataChan2ImChanMap, build 22-Apr-2019 15:38:11 const casacore::Vector& dataPol2ImPolMap, build 22-Apr-2019 15:38:11 const casacore::Vector>& pointingOffset); build 22-Apr-2019 15:38:11 - /* virtual casacore::Int makeVBRow2CFBMap(CFStore2& cfs, */ build 22-Apr-2019 15:38:11 - /* const VisBuffer2& vb, const casacore::Quantity& dPA, */ build 22-Apr-2019 15:38:11 - /* const casacore::Vector& dataChan2ImChanMap, */ build 22-Apr-2019 15:38:11 - /* const casacore::Vector& dataPol2ImPolMap, */ build 22-Apr-2019 15:38:11 - /* const casacore::Vector>& pointingOffset, */ build 22-Apr-2019 15:38:11 - /* const casacore::Bool& doPointing); */ build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 void setPhaseGradPerRow(const casacore::Vector< casacore::Vector >& pointingOffset, build 22-Apr-2019 15:38:11 const casacore::CountedPtr& cfb, build 22-Apr-2019 15:38:11 const vi::VisBuffer2& vb, build 22-Apr-2019 15:38:11 const int& row); build 22-Apr-2019 15:38:11 inline casacore::Matrix& getCFPhaseGrad(const int& row)//, const int& ant0, const int& ant1) build 22-Apr-2019 15:38:11 {return cfPhaseGrad_p(row);} build 22-Apr-2019 15:38:11 - inline casacore::CountedPtr& getCFB(const int& row)//, const int& ant0, const int& ant1) build 22-Apr-2019 15:38:11 - {return vb2CFBMap_p(row);} build 22-Apr-2019 15:38:11 - void setDoPointing(const bool& dop=false) {doPointing_p = dop;} build 22-Apr-2019 15:38:11 - protected: build 22-Apr-2019 15:38:11 + void setDoPointing(const bool& dop=false) {doPointing_p = dop;newPhaseGradComputed_p=false;} build 22-Apr-2019 15:38:11 + // protected: build 22-Apr-2019 15:38:11 casacore::Vector > vb2CFBMap_p; build 22-Apr-2019 15:38:11 casacore::Vector > cfPhaseGrad_p; build 22-Apr-2019 15:38:11 casacore::CountedPtr phaseGradCalculator_p; build 22-Apr-2019 15:38:11 - bool doPointing_p; build 22-Apr-2019 15:38:11 + bool doPointing_p, newPhaseGradComputed_p; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 }; build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 } build 22-Apr-2019 15:38:11 diff --git a/gcwrap/python/scripts/imagerhelpers/imager_base.py b/gcwrap/python/scripts/imagerhelpers/imager_base.py build 22-Apr-2019 15:38:11 index f9d8def..4139187 100644 build 22-Apr-2019 15:38:11 --- a/gcwrap/python/scripts/imagerhelpers/imager_base.py build 22-Apr-2019 15:38:11 +++ b/gcwrap/python/scripts/imagerhelpers/imager_base.py build 22-Apr-2019 15:38:11 @@ -96,7 +96,7 @@ class PySynthesisImager: build 22-Apr-2019 15:38:11 exists=False; build 22-Apr-2019 15:38:11 if (not (cfCacheName == '')): build 22-Apr-2019 15:38:11 exists = (os.path.exists(cfCacheName) and os.path.isdir(cfCacheName)); build 22-Apr-2019 15:38:11 -# print "####dopointing",self.allgridpars["0"]["dopointing"]; build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 for fld in range(0,self.NF): build 22-Apr-2019 15:38:11 #print "self.allimpars=",self.allimpars,"\n" build 22-Apr-2019 15:38:11 self.SItool.defineimage( self.allimpars[str(fld)] , self.allgridpars[str(fld)] ) build 22-Apr-2019 15:38:11 diff --git a/gcwrap/tasks/tclean.xml b/gcwrap/tasks/tclean.xml build 22-Apr-2019 15:38:11 index dff905e..e55f2df 100644 build 22-Apr-2019 15:38:11 --- a/gcwrap/tasks/tclean.xml build 22-Apr-2019 15:38:11 +++ b/gcwrap/tasks/tclean.xml build 22-Apr-2019 15:38:11 @@ -815,7 +815,6 @@ HPX HEALPix grid. --> build 22-Apr-2019 15:38:11 imagemosaic build 22-Apr-2019 15:38:11 awproject build 22-Apr-2019 15:38:11 awprojectft build 22-Apr-2019 15:38:11 - awp build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -936,7 +935,7 @@ HPX HEALPix grid. --> build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 Indepently weight each field in a mosaic build 22-Apr-2019 15:38:11 When doing Brigg's style weighting (including uniform) to perform the weight density calculation for each field indepedently if True. If False the weight density is calculated from the average uv distribution of all the fields. build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -994,7 +993,7 @@ HPX HEALPix grid. --> build 22-Apr-2019 15:38:11 True build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 Use conjugate frequency for wideband A-terms build 22-Apr-2019 15:38:11 Use conjugate frequency for wideband A-terms build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 @@ -1041,7 +1040,7 @@ HPX HEALPix grid. --> build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 The parameter makes the gridder utilize the pointing table phase directions while computing the residual image. build 22-Apr-2019 15:38:11 The dopointing flag informs the gridder that it should utilize the pointing table build 22-Apr-2019 15:38:11 to use the correct direction in which the antenna is pointing with respect to the pointing phasecenter. build 22-Apr-2019 15:38:11 @@ -2609,6 +2608,7 @@ to use the correct direction in which the antenna is pointing with respect to th build 22-Apr-2019 15:38:11 360.0 build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 0.2 build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 @@ -2624,20 +2624,7 @@ to use the correct direction in which the antenna is pointing with respect to th build 22-Apr-2019 15:38:11 360.0 build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 - 0.2 build 22-Apr-2019 15:38:11 - False build 22-Apr-2019 15:38:11 - False build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - build 22-Apr-2019 15:38:11 - 1 build 22-Apr-2019 15:38:11 - "flatnoise" build 22-Apr-2019 15:38:11 - False build 22-Apr-2019 15:38:11 - True build 22-Apr-2019 15:38:11 - "" build 22-Apr-2019 15:38:11 - 360.0 build 22-Apr-2019 15:38:11 - 360.0 build 22-Apr-2019 15:38:11 - False build 22-Apr-2019 15:38:11 - False build 22-Apr-2019 15:38:11 + build 22-Apr-2019 15:38:11 0.2 build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 False build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Comparison returned: 1 build 22-Apr-2019 15:38:11 Checkout: git checkout ARD-16 error 22-Apr-2019 15:38:11 Already on 'ARD-16' build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 [git, tag, -a, 5.5.0-94-test-ARD-16-3, -m 'Automatic tag'] build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Done tagging 5.5.0-94-test-ARD-16-3 build 22-Apr-2019 15:38:11 Pushing 5.5.0-94-test-ARD-16-3 to origin error 22-Apr-2019 15:38:11 To ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git error 22-Apr-2019 15:38:11 * [new tag] 5.5.0-94-test-ARD-16-3 -> 5.5.0-94-test-ARD-16-3 build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Pushed 5.5.0-94-test-ARD-16-3 to origin build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 BUILD SUCCESSFUL build 22-Apr-2019 15:38:11 build 22-Apr-2019 15:38:11 Total time: 9.045 secs simple 22-Apr-2019 15:38:12 Finished task 'Script' with result: Success simple 22-Apr-2019 15:38:12 Running post build plugin 'Docker Container Cleanup' simple 22-Apr-2019 15:38:12 Running post build plugin 'NCover Results Collector' simple 22-Apr-2019 15:38:12 Running post build plugin 'Clover Results Collector' simple 22-Apr-2019 15:38:12 Running post build plugin 'npm Cache Cleanup' simple 22-Apr-2019 15:38:12 Running post build plugin 'Artifact Copier' simple 22-Apr-2019 15:38:12 Finalising the build... simple 22-Apr-2019 15:38:12 Stopping timer. simple 22-Apr-2019 15:38:12 Build ARD-BPT13-TBFP-2 completed. simple 22-Apr-2019 15:38:12 Running on server: post build plugin 'NCover Results Collector' simple 22-Apr-2019 15:38:12 Running on server: post build plugin 'Build Hanging Detection Configuration' simple 22-Apr-2019 15:38:12 Running on server: post build plugin 'Clover Delta Calculator' simple 22-Apr-2019 15:38:12 Running on server: post build plugin 'Maven Dependencies Postprocessor' simple 22-Apr-2019 15:38:12 All post build plugins have finished simple 22-Apr-2019 15:38:12 Generating build results summary... simple 22-Apr-2019 15:38:12 Saving build results to disk... simple 22-Apr-2019 15:38:12 Logging substituted variables... simple 22-Apr-2019 15:38:12 Indexing build results... simple 22-Apr-2019 15:38:12 Finished building ARD-BPT13-TBFP-2.