tammojan

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 30403)
+++ CMakeLists.txt	(working copy)
@@ -974,7 +974,7 @@
 casa_find( QWT
   VERSION 5.1.1
   INCLUDES qwt_global.h
-  INCLUDES_SUFFIXES qwt qwt-qt4
+  INCLUDES_SUFFIXES qwt qwt-qt4 qwt5

tammojan

Index: components/ComponentModels/SkyComponentFactory.cc
===================================================================
--- components/ComponentModels/SkyComponentFactory.cc	(revision 30403)
+++ components/ComponentModels/SkyComponentFactory.cc	(working copy)
@@ -26,6 +26,7 @@
 #include <components/ComponentModels/SkyComponentFactory.h>
 
 #include <casa/Quanta/MVAngle.h>
+#include <coordinates/Coordinates/DirectionCoordinate.h>
 #include <components/ComponentModels/GaussianDeconvolver.h>

tammojan

Index: msvis/MSVis/AveragingTvi2.cc
===================================================================
--- msvis/MSVis/AveragingTvi2.cc	(revision 30403)
+++ msvis/MSVis/AveragingTvi2.cc	(working copy)
@@ -1384,7 +1384,7 @@
                              srcVb->isNewSpectralWindow(),
                              subchunk,
                              srcVb->getCorrelationTypes (),
-                             CountedPtr <WeightScaling> (0));
+                             CountedPtr <WeightScaling> ());

tammojan

Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt	(revision 30403)
+++ CMakeLists.txt	(working copy)
@@ -993,8 +993,8 @@
   CPP_VERSION XERCES_FULLVERSIONDOT 
   RUN_VERSION "gXercesMajVersion << '.' << gXercesMinVersion << '.' << gXercesRevision" 
 )
-if( XERCES_VERSION VERSION_EQUAL   3.2 OR
-    XERCES_VERSION VERSION_GREATER 3.2 )

tammojan

Index: synthesis/CMakeLists.txt
===================================================================
--- synthesis/CMakeLists.txt	(revision 30403)
+++ synthesis/CMakeLists.txt	(working copy)
@@ -538,6 +538,7 @@
 install (FILES
 	TransformMachines/BeamSkyJones.h
 	TransformMachines/BeamSquint.h
+	TransformMachines/BeamCalc.h
 	TransformMachines/CFCache.h

tammojan

tammo@dop252:~> ssh [email protected] -o ForwardAgent=yes -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no
Warning: Permanently added '173.247.96.7' (ECDSA) to the list of known hosts.
[email protected]'s password: 
Last login: Tue Jul  7 14:39:55 2015 from 69.red-80-29-40.adsl.static.ccgg.telefonica.net
/usr/bin/xauth:  file /home/travis/.Xauthority does not exist
travis@debug-hs-17672-tammojan-casacore-ruby-1436279741:~$ pwd
/home/travis
travis@debug-hs-17672-tammojan-casacore-ruby-1436279741:~$ sudo apt-get update -q
Hit http://us.archive.ubuntu.com precise Release.gpg
Get:1 http://us.archive.ubuntu.com precise-updates Release.gpg [198 B]

tammojan

diff -I '.*\$Id.*' -r casacore-2.0.1/casa/Arrays/ArrayBase.cc /home/dijkema/opt/casacore/casa_release-4_4/casacore-4_4/casa/Arrays/ArrayBase.cc
95c95
< void ArrayBase::baseReform (ArrayBase& tmp, const IPosition& len) const
---
> void ArrayBase::baseReform (ArrayBase& tmp, const IPosition& len, Bool strict) const
98c98
<   if (len.product() != Int64(nelements())) {
---
>   if (strict && len.product() != Int64(nelements())) {
116a117

tammojan

=== modified file 'SCRIPT/APSYNSIM.py'
--- SCRIPT/APSYNSIM.py	2018-05-18 09:21:35 +0000
+++ SCRIPT/APSYNSIM.py	2018-07-25 08:19:45 +0000
@@ -20,7 +20,7 @@
 #############################################################################
 
 #import Tkinter
-import FileDialog
+#import FileDialog
 import matplotlib as mpl

tammojan

# This is the CMakeCache file.
# For build in directory: /Users/dijkema/opt/gnuradio/build
# It was generated by CMake: /usr/local/Cellar/cmake/3.12.0/bin/cmake
# You can edit this file to change values found and used by cmake.
# If you do not want to change any of the values, simply exit the editor.
# If you do want to change a value, simply edit, save, and exit the editor.
# The syntax for the file is as follows:
# KEY:TYPE=VALUE
# KEY is the name of a variable in the cache.
# TYPE is a hint to GUIs for the type of VALUE, DO NOT EDIT TYPE!.

tammojan

# %ECSV 0.9
# ---
# datatype:
# - {name: datetime, datatype: string}
# - {name: ra, unit: deg, datatype: float64}
# - {name: dec, unit: deg, datatype: float64}
# - {name: azimuth, datatype: float64}
# - {name: altitude, datatype: float64}
# - {name: mag_data, datatype: float64}
# - {name: x_image, unit: pix, datatype: float64}