Commit 33260ad2 authored by Auke L. Klazema's avatar Auke L. Klazema

Task #9893: Merged trunk to epic

parents 01fdad5d 0d45b44c
This diff is collapsed.
......@@ -4,9 +4,6 @@ CEP/Calibration/BBSControl/lofarconf
CEP/Calibration/BBSKernel/Makefile.common
CEP/Calibration/BBSKernel/autoconf_share
CEP/Calibration/BBSKernel/lofarconf
CEP/DP3/AOFlagger/Doxyfile
CEP/DP3/AOFlagger/detectrfi.kdevelop.pcs
CEP/DP3/AOFlagger/detectrfi.kdevses
CEP/DP3/DPPP/Makefile.common
CEP/DP3/DPPP/autoconf_share
CEP/DP3/DPPP/lofarconf
......
......@@ -26,7 +26,7 @@
# $Id$
import sys, copy, math, numpy, signal
from matplotlib.backends.backend_qt4agg import FigureCanvasQT as FigureCanvas
from matplotlib.backends.backend_qt4agg import FigureCanvasQTAgg as FigureCanvas
from matplotlib.backends.backend_qt4agg import NavigationToolbar2QT as NavigationToolbar
from matplotlib.figure import Figure
from matplotlib.font_manager import FontProperties
......
......@@ -244,7 +244,6 @@ void equate(const Location &start, const Location &end,
typename T_CELL_PROCESSOR::StatisticsType &statistics,
T_ITER cells)
{
typedef typename T_CELL_PROCESSOR::CellType CellType;
typedef typename T_CELL_PROCESSOR::StatisticsType StatisticsType;
typedef vector<pair<size_t, size_t> >::const_iterator IteratorType;
......
......@@ -98,7 +98,7 @@ inline RefCountable::RefCountable(const RefCountable&)
inline RefCountable::~RefCountable()
{
ASSERT(itsRefCount == 0);
//ASSERT(itsRefCount == 0);
}
inline void RefCountable::upRefCount() const
......
......@@ -1310,7 +1310,7 @@ namespace
itsTimers[timer].stop();
}
void Statistics::reset()
/*void Statistics::reset()
{
fill(itsCounters, itsCounters + N_Counter, 0);
......@@ -1318,7 +1318,7 @@ namespace
{
itsTimers[i].reset();
}
}
}*/
string Statistics::counters() const
{
......
Version 1.2.0
2011-02-28 André Offringa <of...nga@astro.rug.nl>
* Dependency on GSL removed
* Added RMS plot option
* Added option to rficonsole to specify data column used for flagging
* Added opening of solution tables
* Added some checks and error messages when making common strategy errors
* RFI console will now output the total percentages per polarization
* Added support for skipping mses that have already been flagged
* The edit strategy window works more intuitively now
* Goto window will select current baseline when opening
* RFI Console now writes an entry in the HISTORY table of the Measurement Set
* Logging has been formatted and start time was added.
* Added "Set and show image plane" button in plot menu
* Added feature to continue with already resorted MS in indirect baseline reader
* The AdapterAction has been replaced by the ForEachComplexComponentAction
* Strategy XML file is now formatted to make it human readable
* Allow indirect reading of an MS
* The indirect reading mode can be used in the GUI
* Allow reading of raw RCP files
* Changing the default threshold for baseline selection suggestor to 8 sigma
* Fixed several GUI issues that made the GUI crash when having multiple windows open
* Fixed error when opening reference tables, e.g. concattenated tables.
* Fixed two race conditions found by Helgrind
* Fixed bug in reported coordinates when zooming
* Fixed NaN issues while imaging certain sets
* Fixed bug that prevented column selection to actually have effect
* Allow lower memory machines
* Default strategy is about 20% faster and equally accurate
* Changed directory structure of source code
* Fixed various rare segmentation faults
* A lot of bug fixes and feature enhancements related to filtering
* A lot of doc fixes
* Fixed some bugs that caused NDPPP not to work
* Some Mac fixes by Ger van Diepen
Version 1.1.0
2010-10-22 André Offringa <of...nga@astro.rug.nl>
# $Id$
lofar_package(AOFlagger 1.0 DEPENDS LofarStMan Common LMWCommon)
find_package(PkgConfig)
pkg_check_modules(GTKMM gtkmm-2.4>=2.18)
pkg_check_modules(SIGCXX sigc++-2.0)
include(LofarFindPackage)
lofar_find_package(GSL)
lofar_find_package(LibXml2 REQUIRED)
lofar_find_package(PNG REQUIRED)
lofar_find_package(Casacore REQUIRED COMPONENTS ms tables)
lofar_find_package(Boost REQUIRED COMPONENTS date_time thread filesystem system)
lofar_find_package(FFTW3 REQUIRED)
lofar_find_package(CFITSIO REQUIRED)
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
find_library(RT_LIBRARY rt)
list(APPEND LOFAR_EXTRA_LIBRARIES ${RT_LIBRARY})
endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
add_subdirectory(include/AOFlagger)
add_subdirectory(src)
add_subdirectory(test)
For the latest version and information about installing, go to http://www.astro.rug.nl/rfi-software/ .
You can compile the software by executing from the LOFAR directory:
mkdir build/gnu_opt -p
cd build/gnu_opt
cmake ../.. -DCASACORE_ROOT_DIR=/home/anoko/casacore -DLOG4CPLUS_LIBRARY=/home/anoko/lib/liblog4cplus.a -DLOG4CPLUS_INCLUDE_DIR=/home/anoko/include/
make
Change the casacore and log4cplus directories to the directories where you have installed them.
<?xml version = '1.0'?>
<kdevelop>
<general>
<author/>
<email/>
<version>$VERSION$</version>
<projectmanagement>KDevCustomProject</projectmanagement>
<primarylanguage>C++</primarylanguage>
<ignoreparts/>
<projectdirectory>.</projectdirectory>
<absoluteprojectpath>false</absoluteprojectpath>
<secondaryLanguages>
<language>C</language>
</secondaryLanguages>
<projectname>detectrfi</projectname>
<description/>
<defaultencoding/>
<versioncontrol/>
</general>
<kdevcustomproject>
<filelistdirectory>/</filelistdirectory>
<run>
<mainprogram>CEP/DP3/AOFlagger/src/rfigui</mainprogram>
<directoryradio>executable</directoryradio>
<customdirectory>/</customdirectory>
<programargs/>
<terminal>true</terminal>
<autocompile>true</autocompile>
<envvars/>
<globaldebugarguments/>
<globalcwd>/home/anoko/projects/LOFAR/build/gnu_opt</globalcwd>
<useglobalprogram>false</useglobalprogram>
<autoinstall>false</autoinstall>
<autokdesu>false</autokdesu>
</run>
<build>
<buildtool>make</buildtool>
<builddir>/data/users/offringa/LOFAR/build/gnu_opt/</builddir>
</build>
<make>
<abortonerror>false</abortonerror>
<numberofjobs>3</numberofjobs>
<dontact>false</dontact>
<makebin>/usr/bin/make </makebin>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
</environments>
<prio>0</prio>
<defaulttarget>rfigui</defaulttarget>
<makeoptions>-s</makeoptions>
</make>
<blacklist/>
<filetypes>
<filetype>*.h</filetype>
<filetype>*.H</filetype>
<filetype>*.hh</filetype>
<filetype>*.hxx</filetype>
<filetype>*.hpp</filetype>
<filetype>*.c</filetype>
<filetype>*.C</filetype>
<filetype>*.cc</filetype>
<filetype>*.cpp</filetype>
<filetype>*.c++</filetype>
<filetype>*.cxx</filetype>
<filetype>Makefile</filetype>
<filetype>CMakeLists.txt</filetype>
</filetypes>
<other>
<prio>0</prio>
<otherbin/>
<defaulttarget/>
<otheroptions/>
<selectedenvironment>default</selectedenvironment>
<environments>
<default/>
</environments>
</other>
</kdevcustomproject>
<kdevfilecreate>
<filetypes/>
<useglobaltypes>
<type ext="ui" />
<type ext="cpp" />
<type ext="h" />
</useglobaltypes>
</kdevfilecreate>
<kdevdoctreeview>
<projectdoc>
<userdocDir>html/</userdocDir>
<apidocDir>html/</apidocDir>
</projectdoc>
<ignoreqt_xml/>
<ignoredoxygen/>
<ignorekdocs/>
<ignoretocs/>