From aa3f0b5570a6edabc74a634e22781ea858cfd3f2 Mon Sep 17 00:00:00 2001 From: Arno Schoenmakers <schoenmakers@astron.nl> Date: Wed, 10 Jun 2009 12:52:53 +0000 Subject: [PATCH] Bug 1319: Moved AntennaArray_default.conf to StaticMetaData/AntennaArrays --- .../src/AntennaArrays_default.conf.in | 208 ------------------ MAC/APL/PAC/CalServer/src/Makefile.am | 3 +- 2 files changed, 1 insertion(+), 210 deletions(-) delete mode 100644 MAC/APL/PAC/CalServer/src/AntennaArrays_default.conf.in diff --git a/MAC/APL/PAC/CalServer/src/AntennaArrays_default.conf.in b/MAC/APL/PAC/CalServer/src/AntennaArrays_default.conf.in deleted file mode 100644 index c80412dd8da..00000000000 --- a/MAC/APL/PAC/CalServer/src/AntennaArrays_default.conf.in +++ /dev/null @@ -1,208 +0,0 @@ -DUMMY16 -3 [ 6.867394222 52.910931603 51.275 ] -16 x 2 x 3 [ - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 -] -DUMMY32 -3 [ 6.867394222 52.910931603 51.275 ] -32 x 2 x 3 [ - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 -] -DUMMY48 -3 [ 6.867394222 52.910931603 51.275 ] -48 x 2 x 3 [ - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 -] -DUMMY96 -3 [ 6.867394222 52.910931603 51.275 ] -96 x 2 x 3 [ - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 - -28.495 0.584 0.002 -28.495 0.584 0.002 - -24.924 4.013 0.021 -24.924 4.013 0.021 - -21.497 0.442 0.006 -21.497 0.442 0.006 - -25.066 -2.986 0.005 -25.066 -2.986 0.005 - -2.986 25.067 -0.004 -2.986 25.067 -0.004 - 0.585 28.495 -0.011 0.585 28.495 -0.011 - 4.012 24.922 0.006 4.012 24.922 0.006 - 0.441 21.497 -0.001 0.441 21.497 -0.001 - 21.495 -0.442 -0.028 21.495 -0.442 -0.028 - 25.066 2.986 0.002 25.066 2.986 0.002 - 28.493 -0.584 -0.009 28.493 -0.584 -0.009 - 24.922 -4.012 -0.003 24.922 -4.012 -0.003 - -4.012 -24.922 -0.0001 -4.012 -24.922 -0.0001 - -0.441 -21.497 0.009 -0.441 -21.497 0.009 - 2.986 -25.067 0.005 2.986 -25.067 0.005 - -0.585 -28.495 -0.0001 -0.585 -28.495 -0.0001 -] diff --git a/MAC/APL/PAC/CalServer/src/Makefile.am b/MAC/APL/PAC/CalServer/src/Makefile.am index 0b04b12109b..e802764aa91 100644 --- a/MAC/APL/PAC/CalServer/src/Makefile.am +++ b/MAC/APL/PAC/CalServer/src/Makefile.am @@ -24,8 +24,7 @@ EXTRA_DIST = $(BUILT_SOURCES) sysconf_DATA = \ CalServer.conf \ DipoleModel.conf \ - SourceCatalog.conf \ - AntennaArrays_default.conf + SourceCatalog.conf %.conf: %.conf.in cp $< $@ -- GitLab