Build: #10 was successful
Job: Tag Branch for Packages was successful
Build log
The build generated 377 lines of output. Download or view full build log.
15-Apr-2019 16:56:57 | Build ARD - Build And Package - ARD-15 - Tag Branch for Packages #10 (ARD-BPT15-TBFP-10) started building on agent cbt-el7-4.cv.nrao.edu |
15-Apr-2019 16:56:57 | Remote agent on host cbt-el7-4.cv.nrao.edu |
15-Apr-2019 16:56:57 | Build working directory is /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP |
15-Apr-2019 16:56:57 | Executing build ARD - Build And Package - ARD-15 - Tag Branch for Packages #10 (ARD-BPT15-TBFP-10) |
15-Apr-2019 16:56:57 | Skipping execution of task 'Checkout Default Repository' as it is disabled |
15-Apr-2019 16:56:57 | Running pre-build action: VCS Version Collector |
15-Apr-2019 16:56:57 | Skipping execution of task 'Checkout Default Repository' as it is disabled |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.repository.branch.name} with ARD-15 |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.buildNumber} with 10 |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.planRepository.revision} with 19824e36c16b4940320a9a94518aae457650d771 |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.repository.branch.name} with ARD-15 |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.repository.branch.name} with ARD-15 |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.build.working.directory} with /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP |
15-Apr-2019 16:56:57 | Substituting variable: ${bamboo.planRepository.repositoryUrl} with ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:56:57 | Starting task 'Script' of type 'com.atlassian.bamboo.plugins.scripttask:task.builder.script' |
15-Apr-2019 16:56:57 | Beginning to execute external process for build 'ARD - Build And Package - ARD-15 - Tag Branch for Packages #10 (ARD-BPT15-TBFP-10)' ... running command line: /bin/sh /export/home/cbt-el7-4/bamboohome/temp/ARD-BPT15-TBFP-10-ScriptBuildTask-7712236209778521139.sh ... in: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP ... using extra environment variables: bamboo_planRepository_1_branch=ARD-15 bamboo_capability_buildmachinetype=build bamboo_planRepository_2_branch=master bamboo_planRepository_1_branchDisplayName=ARD-15 bamboo_repository_revision_number=19824e36c16b4940320a9a94518aae457650d771 bamboo_repository_34079312_git_branch=ARD-15 bamboo_repository_20938876_previous_revision_number=f58f7395569d7d77758ab45e8beeb376e7ec00ae bamboo_resultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT15-TBFP-10 bamboo_repository_34079312_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_repository_20938876_git_username= bamboo_build_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP bamboo_planRepository_1_name=OPEN-CASA-FULL bamboo_buildKey=ARD-BPT15-TBFP bamboo_shortPlanName=ARD-15 bamboo_capability_hostname=cbt-el7-4.cv.nrao.edu bamboo_planRepository_2_username= bamboo_repository_34079312_name=OPEN-CASA-FULL bamboo_planRepository_name=OPEN-CASA-FULL bamboo_buildNumber=10 bamboo_planRepository_2_branchDisplayName=master 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_shortJobName=Tag Branch for Packages bamboo_buildResultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT15-TBFP-10 bamboo_planRepository_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_repository_34079312_revision_number=19824e36c16b4940320a9a94518aae457650d771 bamboo_agentId=6160386 bamboo_planName=ARD - Build And Package - ARD-15 bamboo_shortPlanKey=BPT15 bamboo_shortJobKey=TBFP bamboo_repository_34079312_branch_name=ARD-15 bamboo_planRepository_2_name=OPEN-CASA-PKG bamboo_planRepository_revision=19824e36c16b4940320a9a94518aae457650d771 bamboo_buildTimeStamp=2019-04-15T16:56:57.415-04:00 bamboo_repository_previous_revision_number=ab77eee3daba2f266eec1069e2749de8298f45e8 bamboo_casaadm_password=******** bamboo_repository_20938876_git_branch=master bamboo_planRepository_previousRevision=ab77eee3daba2f266eec1069e2749de8298f45e8 bamboo_repository_20938876_branch_name=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_34079312_git_username= bamboo_repository_git_branch=ARD-15 bamboo_buildResultKey=ARD-BPT15-TBFP-10 bamboo_repository_branch_name=ARD-15 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-15 - Tag Branch for Packages bamboo_planRepository_1_revision=19824e36c16b4940320a9a94518aae457650d771 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 bamboo_capability_system_hg_executable=/bin/hg bamboo_repository_name=OPEN-CASA-PKG bamboo_planRepository_2_previousRevision=f58f7395569d7d77758ab45e8beeb376e7ec00ae bamboo_buildFailed=false bamboo_capability_isCIMachine=true bamboo_planRepository_branch=ARD-15 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_repository_git_username= 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_capability_tag=true bamboo_planRepository_1_previousRevision=ab77eee3daba2f266eec1069e2749de8298f45e8 bamboo_repository_34079312_previous_revision_number=ab77eee3daba2f266eec1069e2749de8298f45e8 bamboo_capability_operating_system=EL7 bamboo_planRepository_branchDisplayName=ARD-15 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_1_type=bbserver bamboo_planRepository_branchName=ARD-15 bamboo_capability_project=CASA bamboo_repository_20938876_revision_number=f58f7395569d7d77758ab45e8beeb376e7ec00ae bamboo_planRepository_2_type=bbserver bamboo_capability_system_jdk_JDK=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.102-1.b14.el7_2.x86_64 bamboo_plan_storageTag=plan-33886579 bamboo_hg_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_hg-repositories-cache bamboo_planRepository_2_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git bamboo_planRepository_1_username= bamboo_planRepository_type=bbserver bamboo_git_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_git-repositories-cache bamboo_repository_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_planRepository_2_branchName=master bamboo_capability_system_builder_ant_Ant=/usr bamboo_tmp_directory=/export/home/cbt-el7-4/bamboohome/temp bamboo_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP bamboo_planKey=ARD-BPT15 bamboo_planRepository_1_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git bamboo_planRepository_username= 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 bamboo_repository_20938876_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa-pkg.git 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-15 |
15-Apr-2019 16:56:57 | 10 |
15-Apr-2019 16:56:57 | 19824e36c16b4940320a9a94518aae457650d771 |
15-Apr-2019 16:56:57 | ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:56:57 | Fetching origin |
15-Apr-2019 16:56:58 | Already up-to-date. |
15-Apr-2019 16:56:59 | Starting a Gradle Daemon (subsequent builds will be faster) |
15-Apr-2019 16:57:04 | :compileJava UP-TO-DATE |
15-Apr-2019 16:57:04 | :compileGroovy UP-TO-DATE |
15-Apr-2019 16:57:04 | :processResources UP-TO-DATE |
15-Apr-2019 16:57:04 | :classes UP-TO-DATE |
15-Apr-2019 16:57:04 | :jar UP-TO-DATE |
15-Apr-2019 16:57:04 | :compileTestJava UP-TO-DATE |
15-Apr-2019 16:57:05 | :compileTestGroovy UP-TO-DATE |
15-Apr-2019 16:57:05 | :processTestResources UP-TO-DATE |
15-Apr-2019 16:57:05 | :testClasses UP-TO-DATE |
15-Apr-2019 16:57:05 | :test UP-TO-DATE |
15-Apr-2019 16:57:06 | :uploadArchives |
15-Apr-2019 16:57:06 | |
15-Apr-2019 16:57:06 | BUILD SUCCESSFUL |
15-Apr-2019 16:57:06 | |
15-Apr-2019 16:57:06 | Total time: 7.868 secs |
15-Apr-2019 16:57:08 | :createTag |
15-Apr-2019 16:57:08 | workdir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP/taggitworkdir |
15-Apr-2019 16:57:08 | sourcedir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP/taggitworkdir/casa |
15-Apr-2019 16:57:08 | gitremote: ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:57:08 | branch: ARD-15 |
15-Apr-2019 16:57:08 | Push option: true |
15-Apr-2019 16:57:09 | Switched to branch 'master' |
15-Apr-2019 16:57:09 | |
15-Apr-2019 16:57:09 | Fetching origin |
15-Apr-2019 16:57:10 | From ssh://open-bitbucket.nrao.edu:7999/casa/casa |
15-Apr-2019 16:57:10 | dbe7c08..3d23724 master -> origin/master |
15-Apr-2019 16:57:10 | ab77eee..19824e3 ARD-15 -> origin/ARD-15 |
15-Apr-2019 16:57:10 | d57401f..19824e3 ARD-16 -> origin/ARD-16 |
15-Apr-2019 16:57:10 | * [new branch] CAS-12407 -> origin/CAS-12407 |
15-Apr-2019 16:57:10 | * [new branch] CAS-12410 -> origin/CAS-12410 |
15-Apr-2019 16:57:10 | * [new tag] 5.5.0-134-test-CAS-12410-1 -> 5.5.0-134-test-CAS-12410-1 |
15-Apr-2019 16:57:10 | From ssh://open-bitbucket.nrao.edu:7999/casa/casa |
15-Apr-2019 16:57:10 | * [new tag] 5.5.0-134-bugfix-CAS-12411-1 -> 5.5.0-134-bugfix-CAS-12411-1 |
15-Apr-2019 16:57:10 | * [new tag] 5.5.0-mas-135 -> 5.5.0-mas-135 |
15-Apr-2019 16:57:10 | * [new tag] 5.5.0-mas-136 -> 5.5.0-mas-136 |
15-Apr-2019 16:57:11 | Updating dbe7c08..3d23724 |
15-Apr-2019 16:57:11 | Fast-forward |
15-Apr-2019 16:57:11 | code/mstransform/TVI/StatWtTVI.cc | 42 ++++-- |
15-Apr-2019 16:57:11 | code/msvis/MSVis/VisBufferUtil.cc | 156 ++++++++++++++------- |
15-Apr-2019 16:57:11 | code/synthesis/CMakeLists.txt | 1 + |
15-Apr-2019 16:57:11 | code/synthesis/ImagerObjects/SDAlgorithmBase.cc | 2 +- |
15-Apr-2019 16:57:11 | code/synthesis/ImagerObjects/SDMaskHandler.cc | 11 +- |
15-Apr-2019 16:57:11 | code/synthesis/ImagerObjects/SIImageStore.cc | 9 +- |
15-Apr-2019 16:57:11 | code/synthesis/MeasurementEquations/Imager2.cc | 11 +- |
15-Apr-2019 16:57:11 | code/synthesis/MeasurementEquations/SkyEquation.cc | 25 ++-- |
15-Apr-2019 16:57:11 | .../MeasurementEquations/test/tPredictComp.cc | 105 ++++++++++++++ |
15-Apr-2019 16:57:11 | code/synthesis/TransformMachines/BeamSkyJones.cc | 97 ++++++++++--- |
15-Apr-2019 16:57:11 | code/synthesis/TransformMachines/BeamSkyJones.h | 15 +- |
15-Apr-2019 16:57:11 | code/synthesis/TransformMachines/SkyJones.h | 4 +- |
15-Apr-2019 16:57:11 | code/synthesis/TransformMachines2/BeamSkyJones.cc | 12 +- |
15-Apr-2019 16:57:11 | code/synthesis/TransformMachines2/BeamSkyJones.h | 2 +- |
15-Apr-2019 16:57:11 | gcwrap/tasks/tclean.xml | 24 +++- |
15-Apr-2019 16:57:11 | gcwrap/tools/CMakeLists.txt | 1 + |
15-Apr-2019 16:57:11 | gcwrap/tools/casaswig_types.cc | 29 ++++ |
15-Apr-2019 16:57:11 | gcwrap/tools/casaswig_types.h | 13 ++ |
15-Apr-2019 16:57:11 | gcwrap/tools/synthesis/imager.xml | 3 +- |
15-Apr-2019 16:57:11 | gcwrap/tools/synthesis/simulator.xml | 2 +- |
15-Apr-2019 16:57:11 | 20 files changed, 443 insertions(+), 121 deletions(-) |
15-Apr-2019 16:57:11 | create mode 100644 code/synthesis/MeasurementEquations/test/tPredictComp.cc |
15-Apr-2019 16:57:11 | create mode 100644 gcwrap/tools/casaswig_types.cc |
15-Apr-2019 16:57:11 | |
15-Apr-2019 16:57:11 | edu.nrao.gradle.casa.build.GitRepository@5dc5384f |
15-Apr-2019 16:57:11 | getLastTag called with |
15-Apr-2019 16:57:11 | branch: ARD-15 |
15-Apr-2019 16:57:11 | env: [bamboo_planRepository_1_branch=ARD-15, 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=19824e36c16b4940320a9a94518aae457650d771, bamboo_planRepository_1_branchDisplayName=ARD-15, bamboo_repository_20938876_previous_revision_number=f58f7395569d7d77758ab45e8beeb376e7ec00ae, bamboo_repository_34079312_git_repositoryUrl=ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git, GUESTFISH_RESTORE=\e[0m, bamboo_repository_20938876_git_username=, WRAPPER_BITS=32, bamboo_buildKey=ARD-BPT15-TBFP, bamboo_repository_34079312_name=OPEN-CASA-FULL, PROMPT_COMMAND=history -a, PWD=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-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_buildResultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT15-TBFP-10, 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=19824e36c16b4940320a9a94518aae457650d771, bamboo_casaadm_password=********, bamboo_planRepository_previousRevision=ab77eee3daba2f266eec1069e2749de8298f45e8, 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-15, 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, XDG_SESSION_ID=3, bamboo_capability_isCIMachine=true, GRADLE_USER_HOME=/users/casaci/.gradle.el6.cbt-el7-4, bamboo_planRepository_branch=ARD-15, bamboo_capability_tag=true, bamboo_repository_34079312_previous_revision_number=ab77eee3daba2f266eec1069e2749de8298f45e8, 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-15, bamboo_planRepository_1_type=bbserver, 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_git_cache_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/_git-repositories-cache, bamboo_planRepository_2_branchName=master, 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-BPT15, bamboo_planRepository_username=, NLSPATH=/usr/dt/lib/nls/msg/%L/%N.cat, BASH_FUNC_module()=() { eval `/usr/bin/modulecmd bash $*` |
15-Apr-2019 16:57:11 | }, 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-15, 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_repository_34079312_git_branch=ARD-15, bamboo_resultsUrl=https://open-bamboo.nrao.edu/browse/ARD-BPT15-TBFP-10, MODULEPATH=/usr/share/Modules/modulefiles:/etc/modulefiles, bamboo_build_working_directory=/export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP, bamboo_planRepository_1_name=OPEN-CASA-FULL, QT_GRAPHICSSYSTEM=native, bamboo_shortPlanName=ARD-15, 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=10, SHELL=/bin/bash, bamboo_repository_34079312_revision_number=19824e36c16b4940320a9a94518aae457650d771, bamboo_planName=ARD - Build And Package - ARD-15, bamboo_shortPlanKey=BPT15, OLDPWD=/usr/lib/jvm/gradle-3.2.1, bamboo_shortJobKey=TBFP, bamboo_repository_34079312_branch_name=ARD-15, bamboo_planRepository_2_name=OPEN-CASA-PKG, SSH_ASKPASS=/usr/libexec/openssh/gnome-ssh-askpass, bamboo_repository_previous_revision_number=ab77eee3daba2f266eec1069e2749de8298f45e8, bamboo_buildTimeStamp=2019-04-15T16:56:57.415-04:00, bamboo_repository_20938876_branch_name=master, bamboo_buildResultKey=ARD-BPT15-TBFP-10, bamboo_repository_git_branch=ARD-15, bamboo_repository_34079312_git_username=, 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-15 - 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=19824e36c16b4940320a9a94518aae457650d771, bamboo_capability_system_hg_executable=/bin/hg, bamboo_repository_name=OPEN-CASA-PKG, bamboo_planRepository_2_previousRevision=f58f7395569d7d77758ab45e8beeb376e7ec00ae, 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=ab77eee3daba2f266eec1069e2749de8298f45e8, bamboo_repository_git_username=, bamboo_capability_operating_system=EL7, bamboo_planRepository_branchDisplayName=ARD-15, bamboo_capability_project=CASA, bamboo_planRepository_2_type=bbserver, GUESTFISH_PS1=\[\e[1;32m\]><fs>\[\e[0;31m\] , bamboo_plan_storageTag=plan-33886579, 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-BPT15-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] |
15-Apr-2019 16:57:11 | sourceDir: /export/home/cbt-el7-4/bamboohome/xml-data/build-dir/ARD-BPT15-TBFP/taggitworkdir/casa |
15-Apr-2019 16:57:11 | Resolving CAS-/feature/bugfix tag |
15-Apr-2019 16:57:11 | Branch parts: [ARD-15] |
15-Apr-2019 16:57:11 | Checking for an existing tag for the branch |
15-Apr-2019 16:57:11 | tagGrep: grep test-ARD-15 |
15-Apr-2019 16:57:11 | java.lang.UNIXProcess@1dbfea05 | java.lang.UNIXProcess@224e8365 | java.lang.UNIXProcess@773b9a7c | java.lang.UNIXProcess@3d669cf1 |
15-Apr-2019 16:57:11 | Checking out ARD-15 |
15-Apr-2019 16:57:11 | Switched to branch 'ARD-15' |
15-Apr-2019 16:57:11 | Your branch is behind 'origin/ARD-15' by 7 commits, and can be fast-forwarded. |
15-Apr-2019 16:57:11 | (use "git pull" to update your local branch) |
15-Apr-2019 16:57:11 | |
15-Apr-2019 16:57:11 | Updating ARD-15 |
15-Apr-2019 16:57:12 | Updating ab77eee..19824e3 |
15-Apr-2019 16:57:12 | Fast-forward |
15-Apr-2019 16:57:12 | code/synthesis/TransformMachines2/PhaseGrad.cc | 50 +++++++++++++++++--------- |
15-Apr-2019 16:57:12 | code/synthesis/TransformMachines2/PhaseGrad.h | 9 +++-- |
15-Apr-2019 16:57:12 | code/synthesis/TransformMachines2/VB2CFBMap.cc | 26 +++++++++----- |
15-Apr-2019 16:57:12 | code/synthesis/TransformMachines2/VB2CFBMap.h | 4 +-- |
15-Apr-2019 16:57:12 | 4 files changed, 58 insertions(+), 31 deletions(-) |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | Constructing a new tag based on 5.5.0-94-test-ARD-15-9 |
15-Apr-2019 16:57:12 | Branch: ARD-15 |
15-Apr-2019 16:57:12 | ARD- detected |
15-Apr-2019 16:57:12 | Prefix: 5.5.0-94-test-ARD-15 |
15-Apr-2019 16:57:12 | 5.5.0-94-test-ARD-15-10 |
15-Apr-2019 16:57:12 | Last tag: 5.5.0-94-test-ARD-15-9 |
15-Apr-2019 16:57:12 | Branch: ARD-15 |
15-Apr-2019 16:57:12 | Comparing tag to branch with: git diff --exit-code 5.5.0-94-test-ARD-15-9 ARD-15 |
15-Apr-2019 16:57:12 | diff --git a/code/synthesis/TransformMachines2/PhaseGrad.cc b/code/synthesis/TransformMachines2/PhaseGrad.cc |
15-Apr-2019 16:57:12 | index 8c1ea8e..f188e61 100644 |
15-Apr-2019 16:57:12 | --- a/code/synthesis/TransformMachines2/PhaseGrad.cc |
15-Apr-2019 16:57:12 | +++ b/code/synthesis/TransformMachines2/PhaseGrad.cc |
15-Apr-2019 16:57:12 | @@ -45,16 +45,30 @@ namespace casa{ |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | field_phaseGrad_p = other.field_phaseGrad_p; |
15-Apr-2019 16:57:12 | antenna_phaseGrad_p = other.antenna_phaseGrad_p; |
15-Apr-2019 16:57:12 | - cached_FieldOffset_p[0] = other.cached_FieldOffset_p[0]; |
15-Apr-2019 16:57:12 | - cached_FieldOffset_p[1] = other.cached_FieldOffset_p[1]; |
15-Apr-2019 16:57:12 | - cached_AntennaOffset_p[0] = other.cached_AntennaOffset_p[0]; |
15-Apr-2019 16:57:12 | - cached_AntennaOffset_p[1] = other.cached_AntennaOffset_p[1]; |
15-Apr-2019 16:57:12 | + cached_FieldOffset_p = other.cached_FieldOffset_p; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | return *this; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | // |
15-Apr-2019 16:57:12 | //---------------------------------------------------------------------- |
15-Apr-2019 16:57:12 | // |
15-Apr-2019 16:57:12 | + bool PhaseGrad::needsNewPhaseGrad(const Vector<Vector<double> >& pointingOffset, |
15-Apr-2019 16:57:12 | + const VisBuffer2& vb, |
15-Apr-2019 16:57:12 | + const int& row) |
15-Apr-2019 16:57:12 | + { |
15-Apr-2019 16:57:12 | + unsigned int nRow=vb.nRows(); |
15-Apr-2019 16:57:12 | + if (cached_FieldOffset_p.nelements() < nRow) cached_FieldOffset_p.resize(nRow,true); |
15-Apr-2019 16:57:12 | + |
15-Apr-2019 16:57:12 | + return ( |
15-Apr-2019 16:57:12 | + ((fabs(pointingOffset[row][0]-cached_FieldOffset_p[row](0))) > 1e-12) || |
15-Apr-2019 16:57:12 | + ((fabs(pointingOffset[row][1]-cached_FieldOffset_p[row](1))) > 1e-12) || |
15-Apr-2019 16:57:12 | + (field_phaseGrad_p.shape()[0] < maxCFShape_p[0]) || |
15-Apr-2019 16:57:12 | + (field_phaseGrad_p.shape()[1] < maxCFShape_p[1]) |
15-Apr-2019 16:57:12 | + ); |
15-Apr-2019 16:57:12 | + } |
15-Apr-2019 16:57:12 | + // |
15-Apr-2019 16:57:12 | + //---------------------------------------------------------------------- |
15-Apr-2019 16:57:12 | + // |
15-Apr-2019 16:57:12 | // bool PhaseGrad::ComputeFieldPointingGrad(const Vector<double>& pointingOffset, |
15-Apr-2019 16:57:12 | // const CountedPtr<CFBuffer>& cfb, |
15-Apr-2019 16:57:12 | // const Vector<int>&cfShape, |
15-Apr-2019 16:57:12 | @@ -64,7 +78,7 @@ namespace casa{ |
15-Apr-2019 16:57:12 | // const int& spwID, const int& fieldId) |
15-Apr-2019 16:57:12 | bool PhaseGrad::ComputeFieldPointingGrad(const Vector<Vector<double> >& pointingOffset, |
15-Apr-2019 16:57:12 | const CountedPtr<CFBuffer>& cfb, |
15-Apr-2019 16:57:12 | - const VisBuffer2& ,//vb |
15-Apr-2019 16:57:12 | + const VisBuffer2& vb, |
15-Apr-2019 16:57:12 | const int& row |
15-Apr-2019 16:57:12 | ) |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | @@ -76,30 +90,32 @@ namespace casa{ |
15-Apr-2019 16:57:12 | if (thisCFB != cachedCFBPtr_p) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | maxCFShape_p[0] = maxCFShape_p[1] = cfb->getMaxCFSize(); |
15-Apr-2019 16:57:12 | - // { |
15-Apr-2019 16:57:12 | - // // LogIO log_l(LogOrigin("PhaseGrad","computeFieldPointingGrad")); |
15-Apr-2019 16:57:12 | - // cerr << "CFB changed: "<< thisCFB << " " << cachedCFBPtr_p << " " << vb.spectralWindows()(0) << " " << vb.fieldId()(0) << " " << maxCFShape_p << endl; |
15-Apr-2019 16:57:12 | - // } |
15-Apr-2019 16:57:12 | + { |
15-Apr-2019 16:57:12 | + // LogIO log_l(LogOrigin("PhaseGrad","computeFieldPointingGrad")); |
15-Apr-2019 16:57:12 | + //cerr << "CFB changed: "<< thisCFB << " " << cachedCFBPtr_p << " " << vb.spectralWindows()(0) << " " << vb.fieldId()(0) << " " << maxCFShape_p << endl; |
15-Apr-2019 16:57:12 | + } |
15-Apr-2019 16:57:12 | cachedCFBPtr_p = thisCFB; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | // |
15-Apr-2019 16:57:12 | // If the pointing or the max. CF size changed, recompute the phase gradient. |
15-Apr-2019 16:57:12 | // |
15-Apr-2019 16:57:12 | - if ( |
15-Apr-2019 16:57:12 | - ((fabs(pointingOffset[row][0]-cached_FieldOffset_p[0])) > 1e-6) || |
15-Apr-2019 16:57:12 | - ((fabs(pointingOffset[row][1]-cached_FieldOffset_p[1])) > 1e-6) || |
15-Apr-2019 16:57:12 | - (field_phaseGrad_p.shape()[0] < maxCFShape_p[0]) || |
15-Apr-2019 16:57:12 | - (field_phaseGrad_p.shape()[1] < maxCFShape_p[1]) |
15-Apr-2019 16:57:12 | - ) |
15-Apr-2019 16:57:12 | + if (needsNewPhaseGrad(pointingOffset, vb, row)) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | + LogIO log_l(LogOrigin("PhaseGrad","computeFieldPointingGrad")); |
15-Apr-2019 16:57:12 | + log_l << "Computing Phase Grad: " << row << " " << pointingOffset[row][0] << " " << pointingOffset[row][1] << " " << cached_FieldOffset_p[row](0) << " " |
15-Apr-2019 16:57:12 | + << cached_FieldOffset_p[row](1) << " " << field_phaseGrad_p.shape() << " " << maxCFShape_p[0] << " " |
15-Apr-2019 16:57:12 | + << cached_FieldOffset_p.nelements() |
15-Apr-2019 16:57:12 | + << LogIO::POST; |
15-Apr-2019 16:57:12 | + |
15-Apr-2019 16:57:12 | int nx=maxCFShape_p(0), ny=maxCFShape_p(1); |
15-Apr-2019 16:57:12 | double grad; |
15-Apr-2019 16:57:12 | Complex phx,phy; |
15-Apr-2019 16:57:12 | Vector<int> convOrigin = maxCFShape_p/2; |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | field_phaseGrad_p.resize(nx,ny); |
15-Apr-2019 16:57:12 | - cached_FieldOffset_p[0] = pointingOffset[row][0]; |
15-Apr-2019 16:57:12 | - cached_FieldOffset_p[1] = pointingOffset[row][1]; |
15-Apr-2019 16:57:12 | + cached_FieldOffset_p[row] = pointingOffset[row]; |
15-Apr-2019 16:57:12 | + // cached_FieldOffset_p[row](0) = pointingOffset[row][0]; |
15-Apr-2019 16:57:12 | + // cached_FieldOffset_p[row](1) = pointingOffset[row][1]; |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | for(int ix=0;ix<nx;ix++) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | diff --git a/code/synthesis/TransformMachines2/PhaseGrad.h b/code/synthesis/TransformMachines2/PhaseGrad.h |
15-Apr-2019 16:57:12 | index 8801967..e2a4eff 100644 |
15-Apr-2019 16:57:12 | --- a/code/synthesis/TransformMachines2/PhaseGrad.h |
15-Apr-2019 16:57:12 | +++ b/code/synthesis/TransformMachines2/PhaseGrad.h |
15-Apr-2019 16:57:12 | @@ -49,8 +49,8 @@ namespace casa { //# NAMESPACE CASA - BEGIN |
15-Apr-2019 16:57:12 | class PhaseGrad |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | public: |
15-Apr-2019 16:57:12 | - PhaseGrad():field_phaseGrad_p(), antenna_phaseGrad_p(), cachedCFBPtr_p(NULL), maxCFShape_p(2) |
15-Apr-2019 16:57:12 | - {cached_FieldOffset_p[0] = cached_FieldOffset_p[1] = cached_AntennaOffset_p[0] = cached_AntennaOffset_p[1] = 0;} |
15-Apr-2019 16:57:12 | + PhaseGrad():field_phaseGrad_p(), antenna_phaseGrad_p(), cached_FieldOffset_p(), cachedCFBPtr_p(NULL), maxCFShape_p(2) |
15-Apr-2019 16:57:12 | + {}; |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | ~PhaseGrad() {}; |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | @@ -58,6 +58,9 @@ namespace casa { //# NAMESPACE CASA - BEGIN |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | inline const casacore::Matrix<casacore::Complex>& getFieldPointingGrad() {return field_phaseGrad_p;} |
15-Apr-2019 16:57:12 | inline const casacore::Matrix<casacore::Complex>& getAntennaPointingGrad() {return antenna_phaseGrad_p;} |
15-Apr-2019 16:57:12 | + bool needsNewPhaseGrad(const casacore::Vector<casacore::Vector<double> >& pointingOffset, |
15-Apr-2019 16:57:12 | + const vi::VisBuffer2& vb, |
15-Apr-2019 16:57:12 | + const int& row); |
15-Apr-2019 16:57:12 | // void getPhaseGrad(casacore::Matrix<casacore::Complex>& fullPhaseGrad) {fullPhaseGrad = antenna_phaseGrad_p + sky_phaseGrad_p;} |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | bool ComputeFieldPointingGrad(const casacore::Vector<double>& pointingOffset, |
15-Apr-2019 16:57:12 | @@ -77,7 +80,7 @@ namespace casa { //# NAMESPACE CASA - BEGIN |
15-Apr-2019 16:57:12 | // private: |
15-Apr-2019 16:57:12 | casacore::Matrix<casacore::Complex> field_phaseGrad_p; |
15-Apr-2019 16:57:12 | casacore::Matrix<casacore::Complex> antenna_phaseGrad_p; |
15-Apr-2019 16:57:12 | - casacore::Double cached_FieldOffset_p[2], cached_AntennaOffset_p[2]; |
15-Apr-2019 16:57:12 | + casacore::Vector<casacore::RigidVector<double, 2> > cached_FieldOffset_p; |
15-Apr-2019 16:57:12 | CFBuffer* cachedCFBPtr_p; |
15-Apr-2019 16:57:12 | casacore::Vector<int> maxCFShape_p; |
15-Apr-2019 16:57:12 | }; |
15-Apr-2019 16:57:12 | diff --git a/code/synthesis/TransformMachines2/VB2CFBMap.cc b/code/synthesis/TransformMachines2/VB2CFBMap.cc |
15-Apr-2019 16:57:12 | index 645e3f2..ee1e3df 100644 |
15-Apr-2019 16:57:12 | --- a/code/synthesis/TransformMachines2/VB2CFBMap.cc |
15-Apr-2019 16:57:12 | +++ b/code/synthesis/TransformMachines2/VB2CFBMap.cc |
15-Apr-2019 16:57:12 | @@ -48,6 +48,7 @@ using namespace vi; |
15-Apr-2019 16:57:12 | VB2CFBMap::VB2CFBMap(): vb2CFBMap_p(), cfPhaseGrad_p(), phaseGradCalculator_p(),doPointing_p(false) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | phaseGradCalculator_p = new PhaseGrad(); |
15-Apr-2019 16:57:12 | + newPhaseGradComputed_p = false; |
15-Apr-2019 16:57:12 | }; |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | VB2CFBMap& VB2CFBMap::operator=(const VB2CFBMap& other) |
15-Apr-2019 16:57:12 | @@ -67,23 +68,22 @@ using namespace vi; |
15-Apr-2019 16:57:12 | const vi::VisBuffer2& vb, |
15-Apr-2019 16:57:12 | const int& row) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | - //if (phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb)) |
15-Apr-2019 16:57:12 | if (doPointing_p) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | - |
15-Apr-2019 16:57:12 | - phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb, row); |
15-Apr-2019 16:57:12 | + if (phaseGradCalculator_p->needsNewPhaseGrad(pointingOffset, vb, 0)) |
15-Apr-2019 16:57:12 | + { |
15-Apr-2019 16:57:12 | + phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb, 0); |
15-Apr-2019 16:57:12 | + newPhaseGradComputed_p=true; |
15-Apr-2019 16:57:12 | + } |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | else |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | phaseGradCalculator_p->ComputeFieldPointingGrad(pointingOffset,cfb,vb, 0); |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | - //cerr<<"doPointing VB2CFBMap::sPGPR: "<<<<endl; |
15-Apr-2019 16:57:12 | - //cerr<<"Shape of PointingOffset VB2CFBMap::sPGPR :"<< pointingOffset.shape() << " " << pointingOffset[row].shape() << endl; |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | - cfPhaseGrad_p(row).assign(phaseGradCalculator_p->getFieldPointingGrad()); |
15-Apr-2019 16:57:12 | + //cfPhaseGrad_p(row).assign(phaseGradCalculator_p->getFieldPointingGrad()); |
15-Apr-2019 16:57:12 | + cfPhaseGrad_p(row).reference(phaseGradCalculator_p->field_phaseGrad_p); |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | - // visResampler_p->setFieldPhaseGrad(phaseGradCalculator_p.getFieldPointingGrad()); |
15-Apr-2019 16:57:12 | - |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | Int VB2CFBMap::makeVBRow2CFBMap(CFStore2& cfs, |
15-Apr-2019 16:57:12 | @@ -105,6 +105,7 @@ using namespace vi; |
15-Apr-2019 16:57:12 | Quantity pa(getPA(vb),"rad"); |
15-Apr-2019 16:57:12 | //PolOuterProduct outerProduct; |
15-Apr-2019 16:57:12 | Int statusCode=CFDefs::MEMCACHE; |
15-Apr-2019 16:57:12 | + |
15-Apr-2019 16:57:12 | for (Int irow=0;irow<nRow;irow++) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | // |
15-Apr-2019 16:57:12 | @@ -126,7 +127,8 @@ using namespace vi; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | catch (CFNotCached& x) |
15-Apr-2019 16:57:12 | { |
15-Apr-2019 16:57:12 | - LogIO log_l(LogOrigin("VB2CFBMap", "makeVBRow2CFMap")); |
15-Apr-2019 16:57:12 | + LogIO log_l(LogOrigin("VB2CFBMap", "makeVBRow2CFBMap[R&D]")); |
15-Apr-2019 16:57:12 | + |
15-Apr-2019 16:57:12 | log_l << "CFs not cached for " << pa.getValue("deg") |
15-Apr-2019 16:57:12 | << " deg, dPA = " << dPA.getValue("deg") |
15-Apr-2019 16:57:12 | << " Field ID = " << vb.fieldId()(0); |
15-Apr-2019 16:57:12 | @@ -148,6 +150,12 @@ using namespace vi; |
15-Apr-2019 16:57:12 | vb2CFBMap_p(irow) = cfb_l; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | + // { |
15-Apr-2019 16:57:12 | + // double n=0; |
15-Apr-2019 16:57:12 | + // for (int i=0;i<cfPhaseGrad_p.nelements();i++) |
15-Apr-2019 16:57:12 | + // n+=cfPhaseGrad_p[i].shape().product()*sizeof(casacore::Complex); |
15-Apr-2019 16:57:12 | + // log_l << "Size of VB2CFBMap::cfPhaseGrad_p = " << n << " bytes" << LogIO::POST; |
15-Apr-2019 16:57:12 | + // } |
15-Apr-2019 16:57:12 | return statusCode; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | diff --git a/code/synthesis/TransformMachines2/VB2CFBMap.h b/code/synthesis/TransformMachines2/VB2CFBMap.h |
15-Apr-2019 16:57:12 | index d87732f..b3cc139 100644 |
15-Apr-2019 16:57:12 | --- a/code/synthesis/TransformMachines2/VB2CFBMap.h |
15-Apr-2019 16:57:12 | +++ b/code/synthesis/TransformMachines2/VB2CFBMap.h |
15-Apr-2019 16:57:12 | @@ -70,12 +70,12 @@ namespace casa { //# NAMESPACE CASA - BEGIN |
15-Apr-2019 16:57:12 | const int& row); |
15-Apr-2019 16:57:12 | inline casacore::Matrix<casacore::Complex>& getCFPhaseGrad(const int& row)//, const int& ant0, const int& ant1) |
15-Apr-2019 16:57:12 | {return cfPhaseGrad_p(row);} |
15-Apr-2019 16:57:12 | - void setDoPointing(const bool& dop=false) {doPointing_p = dop;} |
15-Apr-2019 16:57:12 | + void setDoPointing(const bool& dop=false) {doPointing_p = dop;newPhaseGradComputed_p=false;} |
15-Apr-2019 16:57:12 | // protected: |
15-Apr-2019 16:57:12 | casacore::Vector<casacore::CountedPtr<CFBuffer > > vb2CFBMap_p; |
15-Apr-2019 16:57:12 | casacore::Vector<casacore::Matrix<casacore::Complex> > cfPhaseGrad_p; |
15-Apr-2019 16:57:12 | casacore::CountedPtr<PhaseGrad> phaseGradCalculator_p; |
15-Apr-2019 16:57:12 | - bool doPointing_p; |
15-Apr-2019 16:57:12 | + bool doPointing_p, newPhaseGradComputed_p; |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | }; |
15-Apr-2019 16:57:12 | } |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | Comparison returned: 1 |
15-Apr-2019 16:57:12 | Checkout: git checkout ARD-15 |
15-Apr-2019 16:57:12 | Already on 'ARD-15' |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | [git, tag, -a, 5.5.0-94-test-ARD-15-10, -m 'Automatic tag'] |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | Done tagging 5.5.0-94-test-ARD-15-10 |
15-Apr-2019 16:57:12 | Pushing 5.5.0-94-test-ARD-15-10 to origin |
15-Apr-2019 16:57:12 | To ssh://git@open-bitbucket.nrao.edu:7999/casa/casa.git |
15-Apr-2019 16:57:12 | * [new tag] 5.5.0-94-test-ARD-15-10 -> 5.5.0-94-test-ARD-15-10 |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | Pushed 5.5.0-94-test-ARD-15-10 to origin |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | BUILD SUCCESSFUL |
15-Apr-2019 16:57:12 | |
15-Apr-2019 16:57:12 | Total time: 5.78 secs |
15-Apr-2019 16:57:13 | Finished task 'Script' with result: Success |
15-Apr-2019 16:57:13 | Running post build plugin 'Docker Container Cleanup' |
15-Apr-2019 16:57:13 | Running post build plugin 'NCover Results Collector' |
15-Apr-2019 16:57:13 | Running post build plugin 'Clover Results Collector' |
15-Apr-2019 16:57:13 | Running post build plugin 'npm Cache Cleanup' |
15-Apr-2019 16:57:13 | Running post build plugin 'Artifact Copier' |
15-Apr-2019 16:57:13 | Finalising the build... |
15-Apr-2019 16:57:13 | Stopping timer. |
15-Apr-2019 16:57:13 | Build ARD-BPT15-TBFP-10 completed. |
15-Apr-2019 16:57:13 | Running on server: post build plugin 'NCover Results Collector' |
15-Apr-2019 16:57:13 | Running on server: post build plugin 'Build Hanging Detection Configuration' |
15-Apr-2019 16:57:13 | Running on server: post build plugin 'Clover Delta Calculator' |
15-Apr-2019 16:57:13 | Running on server: post build plugin 'Maven Dependencies Postprocessor' |
15-Apr-2019 16:57:13 | All post build plugins have finished |
15-Apr-2019 16:57:13 | Generating build results summary... |
15-Apr-2019 16:57:13 | Saving build results to disk... |
15-Apr-2019 16:57:13 | Logging substituted variables... |
15-Apr-2019 16:57:13 | Indexing build results... |
15-Apr-2019 16:57:13 | Finished building ARD-BPT15-TBFP-10. |