# # ChangeLog for branches # # Generated by Trac 1.6 # 11/27/24 13:56:36 Tue, 05 Apr 2011 05:36:14 GMT Takeshi Nakazato [2103] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/asapmath.py (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/MSFiller.cpp (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) * branches/casa-prerelease/pre-asap/src/STMath.cpp (modified) New Development: No JIRA Issue: No Ready for ... Mon, 04 Apr 2011 08:33:30 GMT Takeshi Nakazato [2101] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: No Ready for ... Mon, 04 Apr 2011 06:20:55 GMT Takeshi Nakazato [2099] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/MSWriter.cpp (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: Yes CAS-2718 ... Mon, 04 Apr 2011 05:25:37 GMT ShinnosukeKawakami [2097] * branches/parallel (copied) created a new branch, mybranch, for parallelization Mon, 04 Apr 2011 05:24:01 GMT ShinnosukeKawakami [2096] * branches/parallel (deleted) Removing obsolete branch of parallelization. Fri, 01 Apr 2011 10:43:18 GMT WataruKawasaki [2095] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/scantable.py (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) * branches/casa-prerelease/pre-asap/src/Scantable.cpp (modified) * branches/casa-prerelease/pre-asap/src/Scantable.h (modified) * branches/casa-prerelease/pre-asap/src/ScantableWrapper.h (modified) merged from bug fixes from trunk (r2093) Fri, 01 Apr 2011 05:59:00 GMT Takeshi Nakazato [2093] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/cmake/withcasa.cmake (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: No Ready for ... Fri, 01 Apr 2011 05:20:19 GMT Takeshi Nakazato [2091] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/cmake/exec_getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/env.py (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: No Ready for ... Fri, 01 Apr 2011 03:05:04 GMT Takeshi Nakazato [2089] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/CMakeLists.txt (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/cmake/exec_getsvnrev.sh (copied) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: No Ready for ... Fri, 01 Apr 2011 02:23:22 GMT Takeshi Nakazato [2087] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/CMakeLists.txt (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: No Ready for ... Thu, 31 Mar 2011 08:02:11 GMT Takeshi Nakazato [2085] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/MSFiller.cpp (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: Yes CAS-2718 ... Wed, 30 Mar 2011 10:43:43 GMT WataruKawasaki [2082] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/scantable.py (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) * branches/casa-prerelease/pre-asap/src/STLineFinder.cpp (modified) * branches/casa-prerelease/pre-asap/src/Scantable.cpp (modified) * branches/casa-prerelease/pre-asap/src/Scantable.h (modified) * branches/casa-prerelease/pre-asap/src/ScantableWrapper.h (modified) merged bug fixes from trunk (r2081) Fri, 25 Mar 2011 07:54:13 GMT Takeshi Nakazato [2079] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/MSFiller.cpp (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: Yes CAS-2718 ... Fri, 25 Mar 2011 02:53:37 GMT Kana Sugimoto [2077] * branches/testnrao (deleted) removed the test directory Fri, 25 Mar 2011 02:51:10 GMT Kana Sugimoto [2076] * branches/testnrao/testaatm_dir (deleted) removed the test directory Fri, 25 Mar 2011 02:31:43 GMT Kana Sugimoto [2075] * branches/testnrao (modified) removed external property for basic testing Fri, 25 Mar 2011 02:20:47 GMT Kana Sugimoto [2074] * branches/testnrao/testaatm_dir (added) creating a place to test for nrao sync Fri, 25 Mar 2011 02:17:40 GMT Kana Sugimoto [2073] * branches/testnrao (modified) test setting external named testaatm_nodir Fri, 25 Mar 2011 02:15:57 GMT Kana Sugimoto [2072] * branches/testnrao (modified) removed invalid external path Fri, 25 Mar 2011 02:04:58 GMT Kana Sugimoto [2071] * branches/testnrao (modified) test setting external named testnodir Fri, 25 Mar 2011 01:39:57 GMT Kana Sugimoto [2070] * branches/testnrao (added) creating a place to test for nrao sync Fri, 25 Mar 2011 01:18:29 GMT Kana Sugimoto [2069] * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/asaplotbase.py (modified) merged a bug fix in trunk (r2068) Thu, 24 Mar 2011 08:47:01 GMT Kana Sugimoto [2067] * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/flagtoolbar.py (modified) merged a bug fix in trunk (r2066) Thu, 24 Mar 2011 07:12:46 GMT WataruKawasaki [2065] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) * branches/casa-prerelease/pre-asap/src/Scantable.cpp (modified) * branches/casa-prerelease/pre-asap/src/Scantable.h (modified) merged bug fixes from trunk (r2063) Thu, 24 Mar 2011 06:43:46 GMT WataruKawasaki [2063] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) * branches/casa-prerelease/pre-asap/src/Scantable.cpp (modified) * branches/casa-prerelease/pre-asap/src/Scantable.h (modified) merged from trunk (r2057) Wed, 23 Mar 2011 10:48:11 GMT Kana Sugimoto [2062] * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/flagtoolbar.py (modified) Merged a bug fix in trunk (r2061) Wed, 23 Mar 2011 09:50:50 GMT Takeshi Nakazato [2060] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/MSFiller.cpp (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: Yes CAS-2718 ... Sun, 20 Mar 2011 03:46:13 GMT Kana Sugimoto [2057] * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/asapplotter.py (modified) merged a bug fix in trunk (r2056) Fri, 18 Mar 2011 05:08:42 GMT Kana Sugimoto [2055] * branches/casa-prerelease/pre-asap/python (modified) merged a bug fix in trunk(r2053) Fri, 18 Mar 2011 05:02:54 GMT Kana Sugimoto [2054] * branches/casa-prerelease/pre-asap/python/asapplotter.py (modified) * branches/casa-prerelease/pre-asap/python/casatoolbar.py (modified) merged a bug fix in trunk(r2053) Thu, 17 Mar 2011 07:46:12 GMT Kana Sugimoto [2052] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/python/asapplotter.py (modified) * branches/casa-prerelease/pre-asap/python/casatoolbar.py (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) merged a bug fix in trunk(r2051) Tue, 15 Mar 2011 12:55:13 GMT Takeshi Nakazato [2050] * branches/casa-prerelease/pre-asap (modified) * branches/casa-prerelease/pre-asap/Makefile (modified) * branches/casa-prerelease/pre-asap/SConstruct (modified) * branches/casa-prerelease/pre-asap/apps (modified) * branches/casa-prerelease/pre-asap/external-alma (modified) * branches/casa-prerelease/pre-asap/external-alma/atnf/pks/pks_maths.cc (modified) * branches/casa-prerelease/pre-asap/getsvnrev.sh (modified) * branches/casa-prerelease/pre-asap/python (modified) * branches/casa-prerelease/pre-asap/src (modified) * branches/casa-prerelease/pre-asap/src/MSFiller.cpp (modified) * branches/casa-prerelease/pre-asap/src/SConscript (modified) New Development: No JIRA Issue: Yes CAS-2718 ... Tue, 15 Mar 2011 07:33:28 GMT Kana Sugimoto [2048] * branches/casa-prerelease/pre-asap (copied) Creating the prerelease branch for CASA 3.2 release Tue, 15 Mar 2011 07:23:41 GMT Kana Sugimoto [2046] * branches/casa-prerelease/asap (deleted) delete a test branch for creating prerelease branch Tue, 15 Mar 2011 07:22:14 GMT Kana Sugimoto [2045] * branches/casa-prerelease/asap (copied) a test for creating prerelease branch Tue, 15 Mar 2011 07:20:59 GMT Kana Sugimoto [2044] * branches/casa-prerelease (added) Creating a place to store the prerelease branch for CASA-ASAP Tue, 15 Mar 2011 07:05:23 GMT Kana Sugimoto [2043] * branches/casa-prerelease (deleted) Discarding miss operation Tue, 15 Mar 2011 06:59:04 GMT Kana Sugimoto [2042] * branches/casa-prerelease (added) * branches/casa-prerelease/README.txt (added) * branches/casa-prerelease/conf (added) * branches/casa-prerelease/conf/authz (added) * branches/casa-prerelease/conf/passwd (added) * branches/casa-prerelease/conf/svnserve.conf (added) * branches/casa-prerelease/dav (added) * branches/casa-prerelease/db (added) * branches/casa-prerelease/db/current (added) * branches/casa-prerelease/db/format (added) * branches/casa-prerelease/db/fs-type (added) * branches/casa-prerelease/db/revprops (added) * branches/casa-prerelease/db/revprops/0 (added) * branches/casa-prerelease/db/revs (added) * branches/casa-prerelease/db/revs/0 (added) * branches/casa-prerelease/db/transactions (added) * branches/casa-prerelease/db/uuid (added) * branches/casa-prerelease/db/write-lock (added) * branches/casa-prerelease/format (added) * branches/casa-prerelease/hooks (added) * branches/casa-prerelease/hooks/post-commit.tmpl (added) * branches/casa-prerelease/hooks/post-lock.tmpl (added) * branches/casa-prerelease/hooks/post-revprop-change.tmpl (added) * branches/casa-prerelease/hooks/post-unlock.tmpl (added) * branches/casa-prerelease/hooks/pre-commit.tmpl (added) * branches/casa-prerelease/hooks/pre-lock.tmpl (added) * branches/casa-prerelease/hooks/pre-revprop-change.tmpl (added) * branches/casa-prerelease/hooks/pre-unlock.tmpl (added) * branches/casa-prerelease/hooks/start-commit.tmpl (added) * branches/casa-prerelease/locks (added) * branches/casa-prerelease/locks/db-logs.lock (added) * branches/casa-prerelease/locks/db.lock (added) created a place to store prerelease branch for CASA-ASAP Fri, 25 Feb 2011 11:17:34 GMT ShinnosukeKawakami [2014] * branches/parallel/src/STMath.cpp (modified) New Development: No JIRA Issue: No Ready for ... Fri, 25 Feb 2011 03:09:24 GMT Kana Sugimoto [2010] * branches/mergetest (deleted) Removing an old test branch Fri, 25 Feb 2011 02:59:05 GMT Kana Sugimoto [2009] * branches/parallel (copied) Creating a new branch for parallelization works Fri, 03 Dec 2010 03:39:01 GMT Kana Sugimoto [1955] * tags/casa3.1.0asap (moved) The release tag of ASAP in CASA 3.1.0 Fri, 03 Dec 2010 01:43:02 GMT Takeshi Nakazato [1953] * branches/asap4casa3.1.0/CMakeLists.txt (deleted) * branches/asap4casa3.1.0/apps/CMakeLists.txt (deleted) * branches/asap4casa3.1.0/external-alma/atnf/CMakeLists.txt (deleted) * branches/asap4casa3.1.0/external/libpyrap/CMakeLists.txt (deleted) * branches/asap4casa3.1.0/python/CMakeLists.txt (deleted) * branches/asap4casa3.1.0/share/CMakeLists.txt (deleted) * branches/asap4casa3.1.0/src/CMakeLists.txt (deleted) New Development: No JIRA Issue: Yes CAS-2668 ... Thu, 02 Dec 2010 06:26:22 GMT Takeshi Nakazato [1952] * branches/asap4casa3.1.0/CMakeLists.txt (added) * branches/asap4casa3.1.0/apps/CMakeLists.txt (added) * branches/asap4casa3.1.0/external-alma/atnf/CMakeLists.txt (added) * branches/asap4casa3.1.0/external/libpyrap/CMakeLists.txt (added) * branches/asap4casa3.1.0/python/CMakeLists.txt (added) * branches/asap4casa3.1.0/share/CMakeLists.txt (added) * branches/asap4casa3.1.0/src/CMakeLists.txt (added) New Development: Yes JIRA Issue: Yes CAS-2668 ... Fri, 08 Oct 2010 04:14:17 GMT Kana Sugimoto [1943] * branches/asap4casa3.1.0/python/notationwindow.py (modified) merged a bug fix from trunk Thu, 30 Sep 2010 04:28:10 GMT Takeshi Nakazato [1940] * branches/asap4casa3.1.0/external-alma/atnf/PKSIO/PKSMS2writer.cc (modified) New Development: No JIRA Issue: Yes Ready for ... Tue, 21 Sep 2010 08:36:41 GMT Takeshi Nakazato [1936] * branches/asap4casa3.1.0/python/scantable.py (modified) New Development: No JIRA Issue: No Ready for ... Tue, 21 Sep 2010 07:54:16 GMT Takeshi Nakazato [1935] * branches/asap4casa3.1.0/python/asapfitter.py (modified) New Development: No JIRA Issue: No Ready for ... Fri, 17 Sep 2010 09:09:56 GMT Kana Sugimoto [1934] * branches/asap4casa3.1.0 (copied) Created branch for casa 3.1 release. Tue, 14 Sep 2010 02:17:16 GMT Malte Marquarding [1924] * branches/polybatch/python/scantable.py (modified) * branches/polybatch/src/STFit.cpp (modified) * branches/polybatch/src/STFit.h (modified) * branches/polybatch/src/STFitEntry.cpp (modified) * branches/polybatch/src/STFitEntry.h (modified) * branches/polybatch/src/STFitter.cpp (modified) * branches/polybatch/src/STFitter.h (modified) * branches/polybatch/src/Scantable.cpp (modified) * branches/polybatch/src/Scantable.h (modified) * branches/polybatch/src/ScantableWrapper.h (modified) * branches/polybatch/src/python_STFitEntry.cpp (modified) Ticket #206: use STFitEntry as return objetc instead of pointer ... Fri, 10 Sep 2010 01:01:10 GMT Malte Marquarding [1922] * branches/polybatch (copied) Ticket #206: Created branch for poly_baseline modifications Mon, 02 Aug 2010 08:37:37 GMT Kana Sugimoto [1822] * branches/mergetest (copied) Recreating the branch for recover testing Mon, 02 Aug 2010 08:35:49 GMT Kana Sugimoto [1821] * branches/mergetest (deleted) Removing branch for replacing Mon, 02 Aug 2010 06:10:43 GMT Kana Sugimoto [1818] * branches/alma (modified) * branches/alma/SConstruct (modified) * branches/alma/external-alma/atnf/PKSIO/PKSMS2reader.cc (modified) * branches/alma/external-alma/atnf/PKSIO/PKSrecord.h (modified) * branches/alma/external-alma/atnf/pks/pks_maths.cc (modified) * branches/alma/python/env.py (copied) * branches/alma/python/logging.py (copied) * branches/alma/src/AsapLogSink.cpp (copied) * branches/alma/src/AsapLogSink.h (copied) * branches/alma/src/FillerBase.cpp (copied) * branches/alma/src/FillerBase.h (copied) * branches/alma/src/FillerWrapper.h (copied) * branches/alma/src/Makefile (modified) * branches/alma/src/NROFiller.cpp (copied) * branches/alma/src/NROFiller.h (copied) * branches/alma/src/PKSFiller.cpp (copied) * branches/alma/src/PKSFiller.h (copied) * branches/alma/src/SConscript (modified) * branches/alma/src/STFiller.cpp (modified) * branches/alma/src/Scantable.cpp (modified) * branches/alma/src/Scantable.h (modified) * branches/alma/src/python_Filler.cpp (copied) * branches/alma/src/python_LogSink.cpp (copied) * branches/alma/src/python_asap.cpp (modified) * branches/alma/src/python_asap.h (modified) New Development: Yes JIRA Issue: No (merge) ... Mon, 02 Aug 2010 05:23:42 GMT Takeshi Nakazato [1817] * branches/newfiller/src/NROFiller.cpp (modified) * branches/newfiller/src/NROFiller.h (modified) Changed handling of reader_ attribute. Mon, 02 Aug 2010 04:37:57 GMT Malte Marquarding [1816] * branches/newfiller/src/PKSFiller.cpp (modified) added setScanrate. some more logging. added setFlagrow Mon, 02 Aug 2010 04:18:33 GMT Malte Marquarding [1815] * branches/newfiller/src/PKSFiller.cpp (modified) * branches/newfiller/src/PKSFiller.h (modified) Eradicte raw pointer use. Mon, 02 Aug 2010 04:18:05 GMT Malte Marquarding [1814] * branches/newfiller/src/Scantable.cpp (modified) * branches/newfiller/src/Scantable.h (modified) Use casa::String instead as it is derived from std::string but also ... Mon, 02 Aug 2010 04:17:07 GMT Malte Marquarding [1813] * branches/newfiller/src/FillerWrapper.h (modified) Check for existing file here Mon, 02 Aug 2010 02:55:43 GMT Takeshi Nakazato [1812] * branches/newfiller/src/Makefile (modified) * branches/newfiller/src/NROFiller.cpp (modified) * branches/newfiller/src/NROFiller.h (modified) Makefile is updated to be able to compile codes using make. Fixed a ... Mon, 02 Aug 2010 02:15:19 GMT Malte Marquarding [1811] * branches/newfiller/src/FillerBase.h (modified) * branches/newfiller/src/FillerWrapper.h (modified) * branches/newfiller/src/PKSFiller.h (modified) disable default, copy ctor and assignment op Mon, 02 Aug 2010 01:49:42 GMT Malte Marquarding [1810] * branches/newfiller/src/STFiller.cpp (modified) fix nchan handling. pksrec.nchan not implemented in MB reader Mon, 02 Aug 2010 01:43:28 GMT Malte Marquarding [1809] * branches/newfiller/src/FillerBase.cpp (modified) mixed up mjd and interval args Mon, 02 Aug 2010 01:38:07 GMT Malte Marquarding [1808] * branches/newfiller/python/logging.py (modified) forgot to add wraps_dec import Mon, 02 Aug 2010 01:37:39 GMT Malte Marquarding [1807] * branches/newfiller/SConstruct (modified) build the renamed external-alma Mon, 02 Aug 2010 01:37:19 GMT Malte Marquarding [1806] * branches/newfiller/src/FillerWrapper.h (modified) enable PKSFiller Mon, 02 Aug 2010 01:28:11 GMT Malte Marquarding [1805] * branches/newfiller/src/PKSFiller.cpp (modified) Use nchan directly from spectrum Mon, 02 Aug 2010 01:27:25 GMT Malte Marquarding [1804] * branches/newfiller/src/Scantable.cpp (modified) set FLAGROW column default value to 0 Mon, 02 Aug 2010 01:26:59 GMT Malte Marquarding [1803] * branches/newfiller/src/FillerBase.cpp (modified) * branches/newfiller/src/FillerBase.h (modified) Added setFlagrow; removed virtual on all setXYZ methods. Mon, 02 Aug 2010 01:10:52 GMT Takeshi Nakazato [1802] * branches/newfiller/external-alma/atnf/PKSIO/PKSMS2reader.cc (modified) * branches/newfiller/external-alma/atnf/PKSIO/PKSrecord.h (modified) Removed PKSrecord.nchan Mon, 02 Aug 2010 01:05:58 GMT Malte Marquarding [1801] * branches/newfiller/src/FillerWrapper.h (modified) use both filler implementations Mon, 02 Aug 2010 01:04:29 GMT Malte Marquarding [1800] * branches/newfiller/src/FillerBase.h (modified) use protected table_ instead Mon, 02 Aug 2010 01:04:01 GMT Takeshi Nakazato [1799] * branches/newfiller/src/NROFiller.cpp (modified) Removed getTable() since we have direct access to table_ attribute. Mon, 02 Aug 2010 00:51:45 GMT Malte Marquarding [1798] * branches/newfiller (modified) * branches/newfiller/external (deleted) * branches/newfiller/external-alma (copied) * branches/newfiller/external-alma/atnf (copied) * branches/newfiller/external-alma/atnf/PKSIO (copied) * branches/newfiller/external-alma/atnf/pks (copied) * branches/newfiller/python/asapfitter.py (modified) * branches/newfiller/python/asaplotbase.py (modified) * branches/newfiller/python/asapmath.py (modified) * branches/newfiller/python/asapplotter.py (modified) * branches/newfiller/python/asapreader.py (modified) * branches/newfiller/python/scantable.py (modified) * branches/newfiller/src/SConscript (modified) merge -r1774:1797 from alma to newfiller Mon, 02 Aug 2010 00:46:49 GMT Malte Marquarding [1797] * branches/newfiller/python/env.py (added) * branches/newfiller/python/logging.py (added) * branches/newfiller/src/AsapLogSink.cpp (added) * branches/newfiller/src/AsapLogSink.h (added) * branches/newfiller/src/python_LogSink.cpp (added) * branches/newfiller/src/python_asap.cpp (modified) * branches/newfiller/src/python_asap.h (modified) Ticket #193: added new logging class. Also factored out environment ... Fri, 30 Jul 2010 09:00:47 GMT Malte Marquarding [1796] * branches/newfiller/src/python_asap.cpp (modified) * branches/newfiller/src/python_asap.h (modified) add new filler to python Fri, 30 Jul 2010 08:59:51 GMT Malte Marquarding [1795] * branches/newfiller/src/FillerBase.cpp (modified) * branches/newfiller/src/FillerBase.h (modified) * branches/newfiller/src/PKSFiller.cpp (added) * branches/newfiller/src/PKSFiller.h (added) First Working version of the PKSFiller Fri, 30 Jul 2010 08:51:55 GMT Takeshi Nakazato [1794] * branches/newfiller/src/FillerWrapper.h (modified) Uncommented include NROFiller Fri, 30 Jul 2010 08:08:29 GMT Malte Marquarding [1793] * branches/newfiller/src/FillerBase.cpp (modified) * branches/newfiller/src/FillerBase.h (modified) Added setHeader implementation and getReferenceRegex Fri, 30 Jul 2010 07:49:03 GMT Takeshi Nakazato [1792] * branches/newfiller/src/FillerWrapper.h (modified) * branches/newfiller/src/Makefile (modified) * branches/newfiller/src/NROFiller.cpp (modified) * branches/newfiller/src/NROFiller.h (modified) 1. Bug fixes on NROFiller. 2. Makefile is updated to compile ... Fri, 30 Jul 2010 07:14:07 GMT Takeshi Nakazato [1791] * branches/newfiller/src/NROFiller.cpp (added) * branches/newfiller/src/NROFiller.h (added) Added NROFiller. Fri, 30 Jul 2010 07:10:22 GMT Kana Sugimoto [1790] * branches/mergetest/Makefile (copied) * branches/mergetest/getsvnrev.sh (copied) Committing getsvnrev.sh and Makefile copied from alma branch. Fri, 30 Jul 2010 06:59:56 GMT Kana Sugimoto [1789] * branches/mergetest/apps (modified) * branches/mergetest/apps/Makefile (copied) * branches/mergetest/apps/asap2to3.cpp (modified) * branches/mergetest/external-alma (copied) * branches/mergetest/python (modified) * branches/mergetest/python/__init__.py (modified) * branches/mergetest/python/asapfitter.py (modified) * branches/mergetest/python/asaplot.py (modified) * branches/mergetest/python/asaplotbase.py (modified) * branches/mergetest/python/asaplotgui.py (modified) * branches/mergetest/python/asaplotgui_gtk.py (modified) * branches/mergetest/python/asaplotgui_qt4.py (copied) * branches/mergetest/python/asapmath.py (modified) * branches/mergetest/python/asapplotter.py (modified) * branches/mergetest/python/asapreader.py (modified) * branches/mergetest/python/casatoolbar.py (copied) * branches/mergetest/python/compatibility.py (copied) * branches/mergetest/python/coordinate.py (copied) * branches/mergetest/python/interactivemask.py (copied) * branches/mergetest/python/lagflagger.py (copied) * branches/mergetest/python/linecatalog.py (modified) * branches/mergetest/python/opacity.py (copied) * branches/mergetest/python/scantable.py (modified) * branches/mergetest/python/selector.py (modified) * branches/mergetest/python/simplelinefinder.py (copied) * branches/mergetest/src (modified) * branches/mergetest/src/IndexedCompare.h (copied) * branches/mergetest/src/Lorentzian1D.h (copied) * branches/mergetest/src/Lorentzian1D.tcc (copied) * branches/mergetest/src/Lorentzian1D2.tcc (copied) * branches/mergetest/src/Lorentzian1DParam.h (copied) * branches/mergetest/src/Lorentzian1DParam.tcc (copied) * branches/mergetest/src/Makefile (copied) * branches/mergetest/src/MathUtils.cpp (modified) * branches/mergetest/src/MathUtils.h (modified) * branches/mergetest/src/RowAccumulator.cpp (modified) * branches/mergetest/src/RowAccumulator.h (modified) * branches/mergetest/src/SConscript (modified) * branches/mergetest/src/STAsciiWriter.cpp (modified) * branches/mergetest/src/STAtmosphere.cpp (copied) * branches/mergetest/src/STAtmosphere.h (copied) * branches/mergetest/src/STCoordinate.h (copied) * branches/mergetest/src/STFITSImageWriter.cpp (copied) * branches/mergetest/src/STFITSImageWriter.h (copied) * branches/mergetest/src/STFiller.cpp (modified) * branches/mergetest/src/STFiller.h (modified) * branches/mergetest/src/STFitter.cpp (modified) * branches/mergetest/src/STFrequencies.cpp (modified) * branches/mergetest/src/STFrequencies.h (modified) * branches/mergetest/src/STHeader.cpp (modified) * branches/mergetest/src/STMath.cpp (modified) * branches/mergetest/src/STMath.h (modified) * branches/mergetest/src/STMathWrapper.h (modified) * branches/mergetest/src/STMolecules.cpp (modified) * branches/mergetest/src/STMolecules.h (modified) * branches/mergetest/src/STSelector.cpp (modified) * branches/mergetest/src/STSelector.h (modified) * branches/mergetest/src/STWriter.cpp (modified) * branches/mergetest/src/STWriter.h (modified) * branches/mergetest/src/Scantable.cpp (modified) * branches/mergetest/src/Scantable.h (modified) * branches/mergetest/src/ScantableWrapper.h (modified) * branches/mergetest/src/Templates.cpp (copied) * branches/mergetest/src/python_STAtmosphere.cpp (copied) * branches/mergetest/src/python_STCoordinate.cpp (copied) * branches/mergetest/src/python_STMath.cpp (modified) * branches/mergetest/src/python_STSelector.cpp (modified) * branches/mergetest/src/python_Scantable.cpp (modified) * branches/mergetest/src/python_SrcType.cpp (copied) * branches/mergetest/src/python_asap.cpp (modified) * branches/mergetest/src/python_asap.h (modified) Merged the all developments from alma branch. copied external-alma. Fri, 30 Jul 2010 06:59:08 GMT Malte Marquarding [1788] * branches/newfiller/src/FillerBase.cpp (modified) * branches/newfiller/src/FillerBase.h (modified) Added omitted elements OPACITY and TSYS Fri, 30 Jul 2010 06:49:24 GMT Malte Marquarding [1787] * branches/newfiller/src/FillerBase.h (modified) * branches/newfiller/src/FillerWrapper.h (modified) * branches/newfiller/src/python_Filler.cpp (modified) Make python wrapper noncopyable Fri, 30 Jul 2010 06:33:06 GMT Malte Marquarding [1786] * branches/newfiller/src/FillerBase.cpp (modified) * branches/newfiller/src/FillerBase.h (modified) * branches/newfiller/src/FillerWrapper.h (moved) * branches/newfiller/src/python_Filler.cpp (added) Added Wrapper and python binding for Filler Fri, 30 Jul 2010 06:20:58 GMT Kana Sugimoto [1785] * branches/mergetest (copied) Created new mergetest branch from trunk for testing merge from alma Fri, 30 Jul 2010 06:17:42 GMT Kana Sugimoto [1784] * branches/mergetest (deleted) Removed current mergetest branch for another test. Fri, 30 Jul 2010 05:55:43 GMT Kana Sugimoto [1783] * branches/alma/external-alma (moved) New Development: No JIRA Issue: No (merge) ... Fri, 30 Jul 2010 04:46:03 GMT Kana Sugimoto [1782] * branches/alma/external/atnf/PKSIO/PKSmsg.cc (copied) * branches/alma/external/atnf/PKSIO/PKSmsg.h (copied) * branches/alma/external/atnf/pks/pks_maths.cc (modified) * branches/alma/python/asapfitter.py (modified) * branches/alma/python/asaplotbase.py (modified) * branches/alma/python/asapmath.py (modified) * branches/alma/python/asapplotter.py (modified) * branches/alma/python/asapreader.py (modified) * branches/alma/python/scantable.py (modified) * branches/alma/src/SConscript (modified) New Development: Yes JIRA Issue: No (merge) ... Fri, 30 Jul 2010 01:32:50 GMT Malte Marquarding [1781] * branches/alma/python/scantable.py (modified) Fix for handling multiple restfrequencies. list of list didn't work ... Thu, 29 Jul 2010 11:42:50 GMT Malte Marquarding [1780] * branches/newfiller/src/FillerBase.cpp (modified) * branches/newfiller/src/FillerBase.h (modified) make filler code compile Thu, 29 Jul 2010 09:13:46 GMT Kana Sugimoto [1779] * branches/mergetest (modified) * branches/mergetest/Makefile (copied) * branches/mergetest/SConstruct (modified) * branches/mergetest/apps/Makefile (copied) * branches/mergetest/apps/asap2to3.cpp (modified) * branches/mergetest/external/atnf/PKSIO/ASTEDataset.cc (copied) * branches/mergetest/external/atnf/PKSIO/ASTEDataset.h (copied) * branches/mergetest/external/atnf/PKSIO/ASTEFXDataset.cc (copied) * branches/mergetest/external/atnf/PKSIO/ASTEFXDataset.h (copied) * branches/mergetest/external/atnf/PKSIO/ASTEFXReader.cc (copied) * branches/mergetest/external/atnf/PKSIO/ASTEFXReader.h (copied) * branches/mergetest/external/atnf/PKSIO/ASTEReader.cc (copied) * branches/mergetest/external/atnf/PKSIO/ASTEReader.h (copied) * branches/mergetest/external/atnf/PKSIO/FITSreader.cc (modified) * branches/mergetest/external/atnf/PKSIO/FITSreader.h (modified) * branches/mergetest/external/atnf/PKSIO/MBFITSreader.cc (modified) * branches/mergetest/external/atnf/PKSIO/MBrecord.cc (modified) * branches/mergetest/external/atnf/PKSIO/MBrecord.h (modified) * branches/mergetest/external/atnf/PKSIO/NRO45FITSReader.cc (copied) * branches/mergetest/external/atnf/PKSIO/NRO45FITSReader.h (copied) * branches/mergetest/external/atnf/PKSIO/NRO45Reader.cc (copied) * branches/mergetest/external/atnf/PKSIO/NRO45Reader.h (copied) * branches/mergetest/external/atnf/PKSIO/NRODataRecord.h (copied) * branches/mergetest/external/atnf/PKSIO/NRODataset.cc (copied) * branches/mergetest/external/atnf/PKSIO/NRODataset.h (copied) * branches/mergetest/external/atnf/PKSIO/NROFITSDataset.cc (copied) * branches/mergetest/external/atnf/PKSIO/NROFITSDataset.h (copied) * branches/mergetest/external/atnf/PKSIO/NROOTFDataset.cc (copied) * branches/mergetest/external/atnf/PKSIO/NROOTFDataset.h (copied) * branches/mergetest/external/atnf/PKSIO/NROReader.cc (copied) * branches/mergetest/external/atnf/PKSIO/NROReader.h (copied) * branches/mergetest/external/atnf/PKSIO/PKSFITSreader.cc (modified) * branches/mergetest/external/atnf/PKSIO/PKSFITSreader.h (modified) * branches/mergetest/external/atnf/PKSIO/PKSMS2reader.cc (modified) * branches/mergetest/external/atnf/PKSIO/PKSMS2reader.h (modified) * branches/mergetest/external/atnf/PKSIO/PKSMS2writer.cc (modified) * branches/mergetest/external/atnf/PKSIO/PKSMS2writer.h (modified) * branches/mergetest/external/atnf/PKSIO/PKSSDwriter.cc (modified) * branches/mergetest/external/atnf/PKSIO/PKSSDwriter.h (modified) * branches/mergetest/external/atnf/PKSIO/PKSmsg.cc (deleted) * branches/mergetest/external/atnf/PKSIO/PKSmsg.h (deleted) * branches/mergetest/external/atnf/PKSIO/PKSreader.cc (modified) * branches/mergetest/external/atnf/PKSIO/PKSreader.h (modified) * branches/mergetest/external/atnf/PKSIO/PKSrecord.h (modified) * branches/mergetest/external/atnf/PKSIO/PKSwriter.h (modified) * branches/mergetest/external/atnf/PKSIO/SDFITSreader.cc (modified) * branches/mergetest/external/atnf/PKSIO/SDFITSreader.h (modified) * branches/mergetest/external/atnf/PKSIO/SDFITSwriter.cc (modified) * branches/mergetest/external/atnf/PKSIO/SDFITSwriter.h (modified) * branches/mergetest/external/atnf/PKSIO/SrcType.h (copied) * branches/mergetest/external/atnf/PKSIO/makefile (modified) * branches/mergetest/external/atnf/pks/makefile (modified) * branches/mergetest/external/atnf/pks/pks_maths.cc (modified) * branches/mergetest/external/atnf/pks/pksmb_support.cc (deleted) * branches/mergetest/external/atnf/pks/pksmb_support.h (deleted) * branches/mergetest/getsvnrev.sh (copied) * branches/mergetest/python/__init__.py (modified) * branches/mergetest/python/asapfitter.py (modified) * branches/mergetest/python/asaplot.py (modified) * branches/mergetest/python/asaplotbase.py (modified) * branches/mergetest/python/asaplotgui.py (modified) * branches/mergetest/python/asaplotgui_gtk.py (modified) * branches/mergetest/python/asaplotgui_qt4.py (copied) * branches/mergetest/python/asapmath.py (modified) * branches/mergetest/python/asapplotter.py (modified) * branches/mergetest/python/asapreader.py (modified) * branches/mergetest/python/casatoolbar.py (copied) * branches/mergetest/python/compatibility.py (copied) * branches/mergetest/python/coordinate.py (copied) * branches/mergetest/python/interactivemask.py (copied) * branches/mergetest/python/lagflagger.py (copied) * branches/mergetest/python/linecatalog.py (modified) * branches/mergetest/python/opacity.py (copied) * branches/mergetest/python/scantable.py (modified) * branches/mergetest/python/selector.py (modified) * branches/mergetest/python/simplelinefinder.py (copied) * branches/mergetest/src/IndexedCompare.h (copied) * branches/mergetest/src/Lorentzian1D.h (copied) * branches/mergetest/src/Lorentzian1D.tcc (copied) * branches/mergetest/src/Lorentzian1D2.tcc (copied) * branches/mergetest/src/Lorentzian1DParam.h (copied) * branches/mergetest/src/Lorentzian1DParam.tcc (copied) * branches/mergetest/src/Makefile (copied) * branches/mergetest/src/MathUtils.cpp (modified) * branches/mergetest/src/MathUtils.h (modified) * branches/mergetest/src/RowAccumulator.cpp (modified) * branches/mergetest/src/RowAccumulator.h (modified) * branches/mergetest/src/SConscript (modified) * branches/mergetest/src/STAsciiWriter.cpp (modified) * branches/mergetest/src/STAtmosphere.cpp (copied) * branches/mergetest/src/STAtmosphere.h (copied) * branches/mergetest/src/STCoordinate.h (copied) * branches/mergetest/src/STFITSImageWriter.cpp (copied) * branches/mergetest/src/STFITSImageWriter.h (copied) * branches/mergetest/src/STFiller.cpp (modified) * branches/mergetest/src/STFiller.h (modified) * branches/mergetest/src/STFitter.cpp (modified) * branches/mergetest/src/STFrequencies.cpp (modified) * branches/mergetest/src/STFrequencies.h (modified) * branches/mergetest/src/STHeader.cpp (modified) * branches/mergetest/src/STMath.cpp (modified) * branches/mergetest/src/STMath.h (modified) * branches/mergetest/src/STMathWrapper.h (modified) * branches/mergetest/src/STMolecules.cpp (modified) * branches/mergetest/src/STMolecules.h (modified) * branches/mergetest/src/STSelector.cpp (modified) * branches/mergetest/src/STSelector.h (modified) * branches/mergetest/src/STWriter.cpp (modified) * branches/mergetest/src/STWriter.h (modified) * branches/mergetest/src/Scantable.cpp (modified) * branches/mergetest/src/Scantable.h (modified) * branches/mergetest/src/ScantableWrapper.h (modified) * branches/mergetest/src/Templates.cpp (copied) * branches/mergetest/src/python_STAtmosphere.cpp (copied) * branches/mergetest/src/python_STCoordinate.cpp (copied) * branches/mergetest/src/python_STMath.cpp (modified) * branches/mergetest/src/python_STSelector.cpp (modified) * branches/mergetest/src/python_Scantable.cpp (modified) * branches/mergetest/src/python_SrcType.cpp (copied) * branches/mergetest/src/python_asap.cpp (modified) * branches/mergetest/src/python_asap.h (modified) New Development: Yes JIRA Issue: No (test merging alma ... Thu, 29 Jul 2010 08:42:54 GMT Malte Marquarding [1778] * branches/newfiller/src/Filler.h (added) * branches/newfiller/src/FillerBase.cpp (added) * branches/newfiller/src/FillerBase.h (added) * branches/newfiller/src/Scantable.cpp (modified) Initial untested Filler rewrite Thu, 29 Jul 2010 08:05:26 GMT Malte Marquarding [1777] * branches/mergetest (copied) * branches/mergetest/src/STFiller.cpp (modified) * branches/mergetest/src/STMath.cpp (modified) * branches/mergetest/src/python_asap.cpp (modified) * branches/mergetest/src/python_asap.h (modified) Created branch to test alma merge back into trunk Thu, 29 Jul 2010 08:04:54 GMT Malte Marquarding [1776] * branches/mergetest (deleted) Wrong way around Thu, 29 Jul 2010 08:04:19 GMT Malte Marquarding [1775] * branches/mergetest (copied) Created branch to test alma merge back into trunk Thu, 29 Jul 2010 08:03:10 GMT Malte Marquarding [1774] * branches/newfiller (copied) Created branch to do Filler redesign Thu, 29 Jul 2010 06:38:22 GMT Kana Sugimoto [1771] * branches/alma/external/atnf/PKSIO/PKSMS2writer.cc (modified) New Development: No JIRA Issue: No Ready for ... Thu, 29 Jul 2010 06:29:30 GMT Kana Sugimoto [1770] * branches/alma (modified) * branches/alma/INSTALL (modified) * branches/alma/python/opacity.py (modified) New Development: Yes JIRA Issue: No (to merge the alma ...