Skip to content
Snippets Groups Projects
Commit 1b36efd6 authored by Ger van Diepen's avatar Ger van Diepen
Browse files

bug 1408: 

Inserted new copyright header
Removed CS1_ prefix
Moved SPWCombine.h to include/SPWCombine
parent 283dc270
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 110 additions and 96 deletions
CEP/DP3/SPWCombine/Makefile.am
+ 1
− 1
View file @ 1b36efd6
......@@ -11,7 +11,7 @@ DISTCHECK_CONFIGURE_FLAGS= \
EXTRA_DIST = \
Makefile.common \
CS1_SPWCombine.spec \
SPWCombine.spec \
autoconf_share/compiletool
include $(top_srcdir)/Makefile.common
CEP/DP3/SPWCombine/CS1_SPWCombine.spec.in → CEP/DP3/SPWCombine/SPWCombine.spec.in
+ 3
− 3
View file @ 1b36efd6
# -*- Mode:rpm-spec -*-
# CS1_SPWCombine.spec.in
# SPWCombine.spec.in
#
##############################################################################
......@@ -8,7 +8,7 @@
#
##############################################################################
Summary: CS1_SPWCombine
Summary: SPWCombine
%define release @RPM_RELEASE@
%define version @VERSION@
......@@ -37,7 +37,7 @@ AutoReqProv: no
%description
CS1_SPWCombine More detailed desciprion will follow.
SPWCombine More detailed desciption will follow.
##############################################################################
#
......
CEP/DP3/SPWCombine/configure.in
+ 3
− 3
View file @ 1b36efd6
......@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
dnl
AC_INIT
AM_CONFIG_HEADER(config.h)
AM_INIT_AUTOMAKE(CS1_SPWCombine, 1.0, no-define)
AM_INIT_AUTOMAKE(SPWCombine, 1.0, no-define)
dnl Initialize for LOFAR (may set compilers)
lofar_INIT
......@@ -54,9 +54,9 @@ AC_CONFIG_FILES([test/runctest.sh:autoconf_share/runctest.sh.in],
[chmod +x test/runctest.sh])
AC_OUTPUT(
include/Makefile
include/CS1_SPWCombine/Makefile
include/SPWCombine/Makefile
src/Makefile
test/Makefile
Makefile
CS1_SPWCombine.spec
SPWCombine.spec
)
CEP/DP3/SPWCombine/include/Makefile.am
+ 1
− 1
View file @ 1b36efd6
SUBDIRS = CS1_SPWCombine
SUBDIRS = SPWCombine
include $(top_srcdir)/Makefile.common
CEP/DP3/SPWCombine/include/CS1_SPWCombine/CombinerProcessControl.h → CEP/DP3/SPWCombine/include/SPWCombine/CombinerProcessControl.h
+ 22
− 19
View file @ 1b36efd6
/***************************************************************************
* Copyright (C) 2007 by Adriaan Renting, ASTRON *
* renting@astron.nl *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
//# Copyright (C) 2007
//# ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
//#
//# This file is part of the LOFAR software suite.
//# The LOFAR software suite is free software: you can redistribute it and/or
//# modify it under the terms of the GNU General Public License as published
//# by the Free Software Foundation, either version 3 of the License, or
//# (at your option) any later version.
//#
//# The LOFAR software suite is distributed in the hope that it will be useful,
//# but WITHOUT ANY WARRANTY; without even the implied warranty of
//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//# GNU General Public License for more details.
//#
//# You should have received a copy of the GNU General Public License along
//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
//#
//# $Id$
//#
//# @author Adriaan Renting
#ifndef LOFARCOMBINERPROCESSCONTROL_H
#define LOFARCOMBINERPROCESSCONTROL_H
......
CEP/DP3/SPWCombine/include/CS1_SPWCombine/Makefile.am → CEP/DP3/SPWCombine/include/SPWCombine/Makefile.am
+ 4
− 0
View file @ 1b36efd6
pkginclude_HEADERS = CombinerProcessControl.h
pkginclude_HEADERS = CombinerProcessControl.h \
SPWCombine.h
include $(top_srcdir)/Makefile.common
CEP/DP3/SPWCombine/package.dox
+ 2
− 2
View file @ 1b36efd6
// \ingroup DP3
// \defgroup CS1_SPWCombine Spectral Window Combine.
// CS1_SPWCombines takes takes all Spectral windows in the input
// \defgroup SPWCombine Spectral Window Combine.
// SPWCombines takes takes all Spectral windows in the input
// measurementset(s), and writes their data as a single Spectral Window
// into the output Measurementset.
CEP/DP3/SPWCombine/src/Combiner.cc
+ 22
− 20
View file @ 1b36efd6
/***************************************************************************
* Copyright (C) 2007 by Adriaan Renting, ASTRON *
* renting@astron.nl *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
//# Copyright (C) 2007
//# ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
//#
//# This file is part of the LOFAR software suite.
//# The LOFAR software suite is free software: you can redistribute it and/or
//# modify it under the terms of the GNU General Public License as published
//# by the Free Software Foundation, either version 3 of the License, or
//# (at your option) any later version.
//#
//# The LOFAR software suite is distributed in the hope that it will be useful,
//# but WITHOUT ANY WARRANTY; without even the implied warranty of
//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//# GNU General Public License for more details.
//#
//# You should have received a copy of the GNU General Public License along
//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
//#
//# $Id$
//#
//# @author Adriaan Renting
#include <lofar_config.h>
#include <libgen.h>
#include <PLC/ACCmain.h>
#include <casa/Exceptions.h>
#include <CS1_SPWCombine/CombinerProcessControl.h>
#include <SPWCombine/CombinerProcessControl.h>
int main(int argc, char *argv[])
{
......
CEP/DP3/SPWCombine/src/CombinerProcessControl.cc
+ 23
− 21
View file @ 1b36efd6
/***************************************************************************
* Copyright (C) 2007 by Adriaan Renting, ASTRON *
* renting@astron.nl *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
//# Copyright (C) 2007
//# ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
//#
//# This file is part of the LOFAR software suite.
//# The LOFAR software suite is free software: you can redistribute it and/or
//# modify it under the terms of the GNU General Public License as published
//# by the Free Software Foundation, either version 3 of the License, or
//# (at your option) any later version.
//#
//# The LOFAR software suite is distributed in the hope that it will be useful,
//# but WITHOUT ANY WARRANTY; without even the implied warranty of
//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//# GNU General Public License for more details.
//#
//# You should have received a copy of the GNU General Public License along
//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
//#
//# $Id$
//#
//# @author Adriaan Renting
#include <lofar_config.h>
#include <iostream>
......@@ -28,8 +30,8 @@
#include <ms/MeasurementSets.h>
#include <casa/Exceptions.h>
#include <CS1_SPWCombine/CombinerProcessControl.h>
#include "SPWCombine.h"
#include <SPWCombine/CombinerProcessControl.h>
#include <SPWCombine/SPWCombine.h>
#define COMBINER_VERSION "0.22"
// 0.10 Initial version based on DataSquasher
......
CEP/DP3/SPWCombine/src/Makefile.am
+ 4
− 5
View file @ 1b36efd6
bin_PROGRAMS = CS1_SPWCombine
bin_PROGRAMS = SPWCombine
CS1_SPWCombine_SOURCES = Combiner.cc \
SPWCombine_SOURCES = Combiner.cc \
SPWCombine.cc \
SPWCombine.h \
CombinerProcessControl.cc
CS1_SPWCombine_LDADD =
CS1_SPWCombine_DEPENDENCIES = $(LOFAR_DEPEND)
SPWCombine_LDADD =
SPWCombine_DEPENDENCIES = $(LOFAR_DEPEND)
include $(top_srcdir)/Makefile.common
CEP/DP3/SPWCombine/src/SPWCombine.cc
+ 24
− 20
View file @ 1b36efd6
/***************************************************************************
* Copyright (C) 2007 by Adriaan Renting, ASTRON *
* renting@astron.nl *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
//# Copyright (C) 2007
//# ASTRON (Netherlands Institute for Radio Astronomy)
//# P.O.Box 2, 7990 AA Dwingeloo, The Netherlands
//#
//# This file is part of the LOFAR software suite.
//# The LOFAR software suite is free software: you can redistribute it and/or
//# modify it under the terms of the GNU General Public License as published
//# by the Free Software Foundation, either version 3 of the License, or
//# (at your option) any later version.
//#
//# The LOFAR software suite is distributed in the hope that it will be useful,
//# but WITHOUT ANY WARRANTY; without even the implied warranty of
//# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
//# GNU General Public License for more details.
//#
//# You should have received a copy of the GNU General Public License along
//# with the LOFAR software suite. If not, see <http://www.gnu.org/licenses/>.
//#
//# $Id$
//#
//# @author Adriaan Renting
#include <lofar_config.h>
#include "SPWCombine.h"
#include <SPWCombine/SPWCombine.h>
namespace LOFAR
{
namespace CS1
......
CEP/DP3/SPWCombine/test/Makefile.am
+ 1
− 1
View file @ 1b36efd6
......@@ -13,7 +13,7 @@ TESTS = $(TESTSCRIPTS)
XFAIL_TESTS =
# all files (.run, .stdout, .in, .log_prop, etc.) needed to run tests
EXTRA_DIST = $(TESTSCRIPTS) CS1_SPWCombine.parset
EXTRA_DIST = $(TESTSCRIPTS) SPWCombine.parset
# Lines to build a test program testprg
#testprg_SOURCES = testprg.cc
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment