diff --git a/.gitattributes b/.gitattributes index 375cbae749c7c4ce182b317237fa680e0661ae87..1c566fe02537f1eaef42c24ee84cda6337e934f7 100644 --- a/.gitattributes +++ b/.gitattributes @@ -298,9 +298,9 @@ MAC/APL/CEPCU/src/ApplController/CMakeLists.txt -text MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.conf -text MAC/APL/CURTDBDaemons/src/LogProcessor/LogProcessor.log_prop -text MAC/APL/DEPENDENCIES -text svneol=native#application/octet-stream -MAC/APL/PAC/BeamServer/test/weights.dat -text svneol=unset#unset -MAC/APL/PAC/CalServer/src/CS010C_HALF_positions.dat -text -MAC/APL/PAC/CalServer/src/CS010C_positions.dat -text +MAC/APL/PAC/Beam_Server/test/weights.dat -text svneol=unset#unset +MAC/APL/PAC/Cal_Server/src/CS010C_HALF_positions.dat -text +MAC/APL/PAC/Cal_Server/src/CS010C_positions.dat -text MAC/APL/PAC/LBA_Calibration/bootstrap -text MAC/APL/PAC/LBA_Calibration/test/20080118_083229_acc_512x96x96.dat.gz -text svneol=unset#application/x-gzip MAC/APL/PAC/LBA_Calibration/test/antpos.dat -text diff --git a/.gitignore b/.gitignore index c8999f3f54cbc2adfe548aa689363cb97759fcea..220016a0e31b51795626a78eb31df1d8e029cca9 100644 --- a/.gitignore +++ b/.gitignore @@ -114,15 +114,15 @@ MAC/APL/MainCU/lofarconf MAC/APL/PAC/BS_Protocol/Makefile.common MAC/APL/PAC/BS_Protocol/autoconf_share MAC/APL/PAC/BS_Protocol/lofarconf -MAC/APL/PAC/BeamServer/Makefile.common -MAC/APL/PAC/BeamServer/autoconf_share -MAC/APL/PAC/BeamServer/lofarconf +MAC/APL/PAC/Beam_Server/Makefile.common +MAC/APL/PAC/Beam_Server/autoconf_share +MAC/APL/PAC/Beam_Server/lofarconf MAC/APL/PAC/CAL_Protocol/Makefile.common MAC/APL/PAC/CAL_Protocol/autoconf_share MAC/APL/PAC/CAL_Protocol/lofarconf -MAC/APL/PAC/CalServer/Makefile.common -MAC/APL/PAC/CalServer/autoconf_share -MAC/APL/PAC/CalServer/lofarconf +MAC/APL/PAC/Cal_Server/Makefile.common +MAC/APL/PAC/Cal_Server/autoconf_share +MAC/APL/PAC/Cal_Server/lofarconf MAC/APL/PAC/Makefile.common MAC/APL/PAC/SHMInfoServer/Makefile.common MAC/APL/PAC/SHMInfoServer/autoconf_share diff --git a/MAC/APL/PAC/BeamServer/BeamServer.spec.in b/MAC/APL/PAC/Beam_Server/BeamServer.spec.in similarity index 100% rename from MAC/APL/PAC/BeamServer/BeamServer.spec.in rename to MAC/APL/PAC/Beam_Server/BeamServer.spec.in diff --git a/MAC/APL/PAC/BeamServer/CMakeLists.txt b/MAC/APL/PAC/Beam_Server/CMakeLists.txt similarity index 100% rename from MAC/APL/PAC/BeamServer/CMakeLists.txt rename to MAC/APL/PAC/Beam_Server/CMakeLists.txt diff --git a/MAC/APL/PAC/BeamServer/Doxyfile b/MAC/APL/PAC/Beam_Server/Doxyfile similarity index 100% rename from MAC/APL/PAC/BeamServer/Doxyfile rename to MAC/APL/PAC/Beam_Server/Doxyfile diff --git a/MAC/APL/PAC/BeamServer/Makefile.am b/MAC/APL/PAC/Beam_Server/Makefile.am similarity index 100% rename from MAC/APL/PAC/BeamServer/Makefile.am rename to MAC/APL/PAC/Beam_Server/Makefile.am diff --git a/MAC/APL/PAC/BeamServer/bootstrap b/MAC/APL/PAC/Beam_Server/bootstrap similarity index 100% rename from MAC/APL/PAC/BeamServer/bootstrap rename to MAC/APL/PAC/Beam_Server/bootstrap diff --git a/MAC/APL/PAC/BeamServer/configure.in b/MAC/APL/PAC/Beam_Server/configure.in similarity index 100% rename from MAC/APL/PAC/BeamServer/configure.in rename to MAC/APL/PAC/Beam_Server/configure.in diff --git a/MAC/APL/PAC/BeamServer/src/Beam.cc b/MAC/APL/PAC/Beam_Server/src/Beam.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beam.cc rename to MAC/APL/PAC/Beam_Server/src/Beam.cc diff --git a/MAC/APL/PAC/BeamServer/src/Beam.h b/MAC/APL/PAC/Beam_Server/src/Beam.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beam.h rename to MAC/APL/PAC/Beam_Server/src/Beam.h diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.cc b/MAC/APL/PAC/Beam_Server/src/BeamServer.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/BeamServer.cc rename to MAC/APL/PAC/Beam_Server/src/BeamServer.cc diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.conf.in b/MAC/APL/PAC/Beam_Server/src/BeamServer.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/src/BeamServer.conf.in rename to MAC/APL/PAC/Beam_Server/src/BeamServer.conf.in diff --git a/MAC/APL/PAC/BeamServer/src/BeamServer.h b/MAC/APL/PAC/Beam_Server/src/BeamServer.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/BeamServer.h rename to MAC/APL/PAC/Beam_Server/src/BeamServer.h diff --git a/MAC/APL/PAC/BeamServer/src/BeamServerConstants.h b/MAC/APL/PAC/Beam_Server/src/BeamServerConstants.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/BeamServerConstants.h rename to MAC/APL/PAC/Beam_Server/src/BeamServerConstants.h diff --git a/MAC/APL/PAC/BeamServer/src/BeamServerMain.cc b/MAC/APL/PAC/Beam_Server/src/BeamServerMain.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/BeamServerMain.cc rename to MAC/APL/PAC/Beam_Server/src/BeamServerMain.cc diff --git a/MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in b/MAC/APL/PAC/Beam_Server/src/BeamServerPorts.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/src/BeamServerPorts.conf.in rename to MAC/APL/PAC/Beam_Server/src/BeamServerPorts.conf.in diff --git a/MAC/APL/PAC/BeamServer/src/Beamlet.cc b/MAC/APL/PAC/Beam_Server/src/Beamlet.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beamlet.cc rename to MAC/APL/PAC/Beam_Server/src/Beamlet.cc diff --git a/MAC/APL/PAC/BeamServer/src/Beamlet.h b/MAC/APL/PAC/Beam_Server/src/Beamlet.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beamlet.h rename to MAC/APL/PAC/Beam_Server/src/Beamlet.h diff --git a/MAC/APL/PAC/BeamServer/src/Beamlets.cc b/MAC/APL/PAC/Beam_Server/src/Beamlets.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beamlets.cc rename to MAC/APL/PAC/Beam_Server/src/Beamlets.cc diff --git a/MAC/APL/PAC/BeamServer/src/Beamlets.h b/MAC/APL/PAC/Beam_Server/src/Beamlets.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beamlets.h rename to MAC/APL/PAC/Beam_Server/src/Beamlets.h diff --git a/MAC/APL/PAC/BeamServer/src/Beams.cc b/MAC/APL/PAC/Beam_Server/src/Beams.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beams.cc rename to MAC/APL/PAC/Beam_Server/src/Beams.cc diff --git a/MAC/APL/PAC/BeamServer/src/Beams.h b/MAC/APL/PAC/Beam_Server/src/Beams.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Beams.h rename to MAC/APL/PAC/Beam_Server/src/Beams.h diff --git a/MAC/APL/PAC/BeamServer/src/CMakeLists.txt b/MAC/APL/PAC/Beam_Server/src/CMakeLists.txt similarity index 100% rename from MAC/APL/PAC/BeamServer/src/CMakeLists.txt rename to MAC/APL/PAC/Beam_Server/src/CMakeLists.txt diff --git a/MAC/APL/PAC/BeamServer/src/Makefile.am b/MAC/APL/PAC/Beam_Server/src/Makefile.am similarity index 100% rename from MAC/APL/PAC/BeamServer/src/Makefile.am rename to MAC/APL/PAC/Beam_Server/src/Makefile.am diff --git a/MAC/APL/PAC/BeamServer/src/beamctl.cc b/MAC/APL/PAC/Beam_Server/src/beamctl.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/beamctl.cc rename to MAC/APL/PAC/Beam_Server/src/beamctl.cc diff --git a/MAC/APL/PAC/BeamServer/src/beamctl.conf.in b/MAC/APL/PAC/Beam_Server/src/beamctl.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/src/beamctl.conf.in rename to MAC/APL/PAC/Beam_Server/src/beamctl.conf.in diff --git a/MAC/APL/PAC/BeamServer/src/beamctl.h b/MAC/APL/PAC/Beam_Server/src/beamctl.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/beamctl.h rename to MAC/APL/PAC/Beam_Server/src/beamctl.h diff --git a/MAC/APL/PAC/BeamServer/src/genapc.py b/MAC/APL/PAC/Beam_Server/src/genapc.py similarity index 100% rename from MAC/APL/PAC/BeamServer/src/genapc.py rename to MAC/APL/PAC/Beam_Server/src/genapc.py diff --git a/MAC/APL/PAC/BeamServer/src/genpset.py b/MAC/APL/PAC/Beam_Server/src/genpset.py similarity index 100% rename from MAC/APL/PAC/BeamServer/src/genpset.py rename to MAC/APL/PAC/Beam_Server/src/genpset.py diff --git a/MAC/APL/PAC/BeamServer/src/gnuplot_i.cc b/MAC/APL/PAC/Beam_Server/src/gnuplot_i.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/src/gnuplot_i.cc rename to MAC/APL/PAC/Beam_Server/src/gnuplot_i.cc diff --git a/MAC/APL/PAC/BeamServer/src/gnuplot_i.h b/MAC/APL/PAC/Beam_Server/src/gnuplot_i.h similarity index 100% rename from MAC/APL/PAC/BeamServer/src/gnuplot_i.h rename to MAC/APL/PAC/Beam_Server/src/gnuplot_i.h diff --git a/MAC/APL/PAC/BeamServer/src/log4cplus.properties.in b/MAC/APL/PAC/Beam_Server/src/log4cplus.properties.in similarity index 100% rename from MAC/APL/PAC/BeamServer/src/log4cplus.properties.in rename to MAC/APL/PAC/Beam_Server/src/log4cplus.properties.in diff --git a/MAC/APL/PAC/BeamServer/test/AVTStub.cc b/MAC/APL/PAC/Beam_Server/test/AVTStub.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/AVTStub.cc rename to MAC/APL/PAC/Beam_Server/test/AVTStub.cc diff --git a/MAC/APL/PAC/BeamServer/test/AVTStub.conf b/MAC/APL/PAC/Beam_Server/test/AVTStub.conf similarity index 100% rename from MAC/APL/PAC/BeamServer/test/AVTStub.conf rename to MAC/APL/PAC/Beam_Server/test/AVTStub.conf diff --git a/MAC/APL/PAC/BeamServer/test/AVTStub.conf.in b/MAC/APL/PAC/Beam_Server/test/AVTStub.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/test/AVTStub.conf.in rename to MAC/APL/PAC/Beam_Server/test/AVTStub.conf.in diff --git a/MAC/APL/PAC/BeamServer/test/AVTStub.h b/MAC/APL/PAC/Beam_Server/test/AVTStub.h similarity index 100% rename from MAC/APL/PAC/BeamServer/test/AVTStub.h rename to MAC/APL/PAC/Beam_Server/test/AVTStub.h diff --git a/MAC/APL/PAC/BeamServer/test/BSTest.h b/MAC/APL/PAC/Beam_Server/test/BSTest.h similarity index 100% rename from MAC/APL/PAC/BeamServer/test/BSTest.h rename to MAC/APL/PAC/Beam_Server/test/BSTest.h diff --git a/MAC/APL/PAC/BeamServer/test/BeamServerTest.cc b/MAC/APL/PAC/Beam_Server/test/BeamServerTest.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/BeamServerTest.cc rename to MAC/APL/PAC/Beam_Server/test/BeamServerTest.cc diff --git a/MAC/APL/PAC/BeamServer/test/BeamServerTest.conf.in b/MAC/APL/PAC/Beam_Server/test/BeamServerTest.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/test/BeamServerTest.conf.in rename to MAC/APL/PAC/Beam_Server/test/BeamServerTest.conf.in diff --git a/MAC/APL/PAC/BeamServer/test/BeamServerTestCppUnit.cc b/MAC/APL/PAC/Beam_Server/test/BeamServerTestCppUnit.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/BeamServerTestCppUnit.cc rename to MAC/APL/PAC/Beam_Server/test/BeamServerTestCppUnit.cc diff --git a/MAC/APL/PAC/BeamServer/test/CMakeLists.txt b/MAC/APL/PAC/Beam_Server/test/CMakeLists.txt similarity index 100% rename from MAC/APL/PAC/BeamServer/test/CMakeLists.txt rename to MAC/APL/PAC/Beam_Server/test/CMakeLists.txt diff --git a/MAC/APL/PAC/BeamServer/test/CheckWeightsTest.cc b/MAC/APL/PAC/Beam_Server/test/CheckWeightsTest.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/CheckWeightsTest.cc rename to MAC/APL/PAC/Beam_Server/test/CheckWeightsTest.cc diff --git a/MAC/APL/PAC/BeamServer/test/CheckWeightsTest2.cc b/MAC/APL/PAC/Beam_Server/test/CheckWeightsTest2.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/CheckWeightsTest2.cc rename to MAC/APL/PAC/Beam_Server/test/CheckWeightsTest2.cc diff --git a/MAC/APL/PAC/BeamServer/test/EPATest.cc b/MAC/APL/PAC/Beam_Server/test/EPATest.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/EPATest.cc rename to MAC/APL/PAC/Beam_Server/test/EPATest.cc diff --git a/MAC/APL/PAC/BeamServer/test/EPATest.conf.in b/MAC/APL/PAC/Beam_Server/test/EPATest.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/test/EPATest.conf.in rename to MAC/APL/PAC/Beam_Server/test/EPATest.conf.in diff --git a/MAC/APL/PAC/BeamServer/test/EPATest.h b/MAC/APL/PAC/Beam_Server/test/EPATest.h similarity index 100% rename from MAC/APL/PAC/BeamServer/test/EPATest.h rename to MAC/APL/PAC/Beam_Server/test/EPATest.h diff --git a/MAC/APL/PAC/BeamServer/test/Makefile.am b/MAC/APL/PAC/Beam_Server/test/Makefile.am similarity index 100% rename from MAC/APL/PAC/BeamServer/test/Makefile.am rename to MAC/APL/PAC/Beam_Server/test/Makefile.am diff --git a/MAC/APL/PAC/BeamServer/test/SweepTest.cc b/MAC/APL/PAC/Beam_Server/test/SweepTest.cc similarity index 100% rename from MAC/APL/PAC/BeamServer/test/SweepTest.cc rename to MAC/APL/PAC/Beam_Server/test/SweepTest.cc diff --git a/MAC/APL/PAC/BeamServer/test/SweepTest.conf.in b/MAC/APL/PAC/Beam_Server/test/SweepTest.conf.in similarity index 100% rename from MAC/APL/PAC/BeamServer/test/SweepTest.conf.in rename to MAC/APL/PAC/Beam_Server/test/SweepTest.conf.in diff --git a/MAC/APL/PAC/BeamServer/test/SweepTest.h b/MAC/APL/PAC/Beam_Server/test/SweepTest.h similarity index 100% rename from MAC/APL/PAC/BeamServer/test/SweepTest.h rename to MAC/APL/PAC/Beam_Server/test/SweepTest.h diff --git a/MAC/APL/PAC/BeamServer/test/avtstub.sh b/MAC/APL/PAC/Beam_Server/test/avtstub.sh similarity index 100% rename from MAC/APL/PAC/BeamServer/test/avtstub.sh rename to MAC/APL/PAC/Beam_Server/test/avtstub.sh diff --git a/MAC/APL/PAC/BeamServer/test/beamctltest b/MAC/APL/PAC/Beam_Server/test/beamctltest similarity index 100% rename from MAC/APL/PAC/BeamServer/test/beamctltest rename to MAC/APL/PAC/Beam_Server/test/beamctltest diff --git a/MAC/APL/PAC/BeamServer/test/bf.c b/MAC/APL/PAC/Beam_Server/test/bf.c similarity index 100% rename from MAC/APL/PAC/BeamServer/test/bf.c rename to MAC/APL/PAC/Beam_Server/test/bf.c diff --git a/MAC/APL/PAC/BeamServer/test/genref.m b/MAC/APL/PAC/Beam_Server/test/genref.m similarity index 100% rename from MAC/APL/PAC/BeamServer/test/genref.m rename to MAC/APL/PAC/Beam_Server/test/genref.m diff --git a/MAC/APL/PAC/BeamServer/test/genref2.m b/MAC/APL/PAC/Beam_Server/test/genref2.m similarity index 100% rename from MAC/APL/PAC/BeamServer/test/genref2.m rename to MAC/APL/PAC/Beam_Server/test/genref2.m diff --git a/MAC/APL/PAC/BeamServer/test/pypcap.py b/MAC/APL/PAC/Beam_Server/test/pypcap.py similarity index 100% rename from MAC/APL/PAC/BeamServer/test/pypcap.py rename to MAC/APL/PAC/Beam_Server/test/pypcap.py diff --git a/MAC/APL/PAC/BeamServer/test/scapy.py b/MAC/APL/PAC/Beam_Server/test/scapy.py similarity index 100% rename from MAC/APL/PAC/BeamServer/test/scapy.py rename to MAC/APL/PAC/Beam_Server/test/scapy.py diff --git a/MAC/APL/PAC/BeamServer/test/weights.dat b/MAC/APL/PAC/Beam_Server/test/weights.dat similarity index 100% rename from MAC/APL/PAC/BeamServer/test/weights.dat rename to MAC/APL/PAC/Beam_Server/test/weights.dat diff --git a/MAC/APL/PAC/CalServer/CMakeLists.txt b/MAC/APL/PAC/Cal_Server/CMakeLists.txt similarity index 100% rename from MAC/APL/PAC/CalServer/CMakeLists.txt rename to MAC/APL/PAC/Cal_Server/CMakeLists.txt diff --git a/MAC/APL/PAC/CalServer/CalServer.spec.in b/MAC/APL/PAC/Cal_Server/CalServer.spec.in similarity index 100% rename from MAC/APL/PAC/CalServer/CalServer.spec.in rename to MAC/APL/PAC/Cal_Server/CalServer.spec.in diff --git a/MAC/APL/PAC/CalServer/Makefile.am b/MAC/APL/PAC/Cal_Server/Makefile.am similarity index 100% rename from MAC/APL/PAC/CalServer/Makefile.am rename to MAC/APL/PAC/Cal_Server/Makefile.am diff --git a/MAC/APL/PAC/CalServer/bootstrap b/MAC/APL/PAC/Cal_Server/bootstrap similarity index 100% rename from MAC/APL/PAC/CalServer/bootstrap rename to MAC/APL/PAC/Cal_Server/bootstrap diff --git a/MAC/APL/PAC/CalServer/configure.in b/MAC/APL/PAC/Cal_Server/configure.in similarity index 100% rename from MAC/APL/PAC/CalServer/configure.in rename to MAC/APL/PAC/Cal_Server/configure.in diff --git a/MAC/APL/PAC/CalServer/src/ACMProxy.cc b/MAC/APL/PAC/Cal_Server/src/ACMProxy.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/ACMProxy.cc rename to MAC/APL/PAC/Cal_Server/src/ACMProxy.cc diff --git a/MAC/APL/PAC/CalServer/src/ACMProxy.h b/MAC/APL/PAC/Cal_Server/src/ACMProxy.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/ACMProxy.h rename to MAC/APL/PAC/Cal_Server/src/ACMProxy.h diff --git a/MAC/APL/PAC/CalServer/src/BlitzMath.h b/MAC/APL/PAC/Cal_Server/src/BlitzMath.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/BlitzMath.h rename to MAC/APL/PAC/Cal_Server/src/BlitzMath.h diff --git a/MAC/APL/PAC/CalServer/src/BlitzMath.tcc b/MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc similarity index 100% rename from MAC/APL/PAC/CalServer/src/BlitzMath.tcc rename to MAC/APL/PAC/Cal_Server/src/BlitzMath.tcc diff --git a/MAC/APL/PAC/CalServer/src/CMakeLists.txt b/MAC/APL/PAC/Cal_Server/src/CMakeLists.txt similarity index 100% rename from MAC/APL/PAC/CalServer/src/CMakeLists.txt rename to MAC/APL/PAC/Cal_Server/src/CMakeLists.txt diff --git a/MAC/APL/PAC/CalServer/src/CS010C_HALF_positions.dat b/MAC/APL/PAC/Cal_Server/src/CS010C_HALF_positions.dat similarity index 100% rename from MAC/APL/PAC/CalServer/src/CS010C_HALF_positions.dat rename to MAC/APL/PAC/Cal_Server/src/CS010C_HALF_positions.dat diff --git a/MAC/APL/PAC/CalServer/src/CS010C_positions.dat b/MAC/APL/PAC/Cal_Server/src/CS010C_positions.dat similarity index 100% rename from MAC/APL/PAC/CalServer/src/CS010C_positions.dat rename to MAC/APL/PAC/Cal_Server/src/CS010C_positions.dat diff --git a/MAC/APL/PAC/CalServer/src/CalServer.cc b/MAC/APL/PAC/Cal_Server/src/CalServer.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalServer.cc rename to MAC/APL/PAC/Cal_Server/src/CalServer.cc diff --git a/MAC/APL/PAC/CalServer/src/CalServer.conf.in b/MAC/APL/PAC/Cal_Server/src/CalServer.conf.in similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalServer.conf.in rename to MAC/APL/PAC/Cal_Server/src/CalServer.conf.in diff --git a/MAC/APL/PAC/CalServer/src/CalServer.h b/MAC/APL/PAC/Cal_Server/src/CalServer.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalServer.h rename to MAC/APL/PAC/Cal_Server/src/CalServer.h diff --git a/MAC/APL/PAC/CalServer/src/CalibrationAlgorithm.cc b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalibrationAlgorithm.cc rename to MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.cc diff --git a/MAC/APL/PAC/CalServer/src/CalibrationAlgorithm.h b/MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalibrationAlgorithm.h rename to MAC/APL/PAC/Cal_Server/src/CalibrationAlgorithm.h diff --git a/MAC/APL/PAC/CalServer/src/CalibrationThread.cc b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalibrationThread.cc rename to MAC/APL/PAC/Cal_Server/src/CalibrationThread.cc diff --git a/MAC/APL/PAC/CalServer/src/CalibrationThread.h b/MAC/APL/PAC/Cal_Server/src/CalibrationThread.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/CalibrationThread.h rename to MAC/APL/PAC/Cal_Server/src/CalibrationThread.h diff --git a/MAC/APL/PAC/CalServer/src/DipoleModel.cc b/MAC/APL/PAC/Cal_Server/src/DipoleModel.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/DipoleModel.cc rename to MAC/APL/PAC/Cal_Server/src/DipoleModel.cc diff --git a/MAC/APL/PAC/CalServer/src/DipoleModel.conf.in b/MAC/APL/PAC/Cal_Server/src/DipoleModel.conf.in similarity index 100% rename from MAC/APL/PAC/CalServer/src/DipoleModel.conf.in rename to MAC/APL/PAC/Cal_Server/src/DipoleModel.conf.in diff --git a/MAC/APL/PAC/CalServer/src/DipoleModel.h b/MAC/APL/PAC/Cal_Server/src/DipoleModel.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/DipoleModel.h rename to MAC/APL/PAC/Cal_Server/src/DipoleModel.h diff --git a/MAC/APL/PAC/CalServer/src/DipoleModelData.cc b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/DipoleModelData.cc rename to MAC/APL/PAC/Cal_Server/src/DipoleModelData.cc diff --git a/MAC/APL/PAC/CalServer/src/DipoleModelData.h b/MAC/APL/PAC/Cal_Server/src/DipoleModelData.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/DipoleModelData.h rename to MAC/APL/PAC/Cal_Server/src/DipoleModelData.h diff --git a/MAC/APL/PAC/CalServer/src/Documentation.h b/MAC/APL/PAC/Cal_Server/src/Documentation.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/Documentation.h rename to MAC/APL/PAC/Cal_Server/src/Documentation.h diff --git a/MAC/APL/PAC/CalServer/src/Makefile.am b/MAC/APL/PAC/Cal_Server/src/Makefile.am similarity index 100% rename from MAC/APL/PAC/CalServer/src/Makefile.am rename to MAC/APL/PAC/Cal_Server/src/Makefile.am diff --git a/MAC/APL/PAC/CalServer/src/RemoteStationCalibration.cc b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/RemoteStationCalibration.cc rename to MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.cc diff --git a/MAC/APL/PAC/CalServer/src/RemoteStationCalibration.h b/MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/RemoteStationCalibration.h rename to MAC/APL/PAC/Cal_Server/src/RemoteStationCalibration.h diff --git a/MAC/APL/PAC/CalServer/src/Source.cc b/MAC/APL/PAC/Cal_Server/src/Source.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/Source.cc rename to MAC/APL/PAC/Cal_Server/src/Source.cc diff --git a/MAC/APL/PAC/CalServer/src/Source.h b/MAC/APL/PAC/Cal_Server/src/Source.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/Source.h rename to MAC/APL/PAC/Cal_Server/src/Source.h diff --git a/MAC/APL/PAC/CalServer/src/SourceCatalog.conf.in b/MAC/APL/PAC/Cal_Server/src/SourceCatalog.conf.in similarity index 100% rename from MAC/APL/PAC/CalServer/src/SourceCatalog.conf.in rename to MAC/APL/PAC/Cal_Server/src/SourceCatalog.conf.in diff --git a/MAC/APL/PAC/CalServer/src/SourceData.cc b/MAC/APL/PAC/Cal_Server/src/SourceData.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/SourceData.cc rename to MAC/APL/PAC/Cal_Server/src/SourceData.cc diff --git a/MAC/APL/PAC/CalServer/src/SourceData.h b/MAC/APL/PAC/Cal_Server/src/SourceData.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/SourceData.h rename to MAC/APL/PAC/Cal_Server/src/SourceData.h diff --git a/MAC/APL/PAC/CalServer/src/SubArraySubscription.cc b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/SubArraySubscription.cc rename to MAC/APL/PAC/Cal_Server/src/SubArraySubscription.cc diff --git a/MAC/APL/PAC/CalServer/src/SubArraySubscription.h b/MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/SubArraySubscription.h rename to MAC/APL/PAC/Cal_Server/src/SubArraySubscription.h diff --git a/MAC/APL/PAC/CalServer/src/SubArrays.cc b/MAC/APL/PAC/Cal_Server/src/SubArrays.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/SubArrays.cc rename to MAC/APL/PAC/Cal_Server/src/SubArrays.cc diff --git a/MAC/APL/PAC/CalServer/src/SubArrays.h b/MAC/APL/PAC/Cal_Server/src/SubArrays.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/SubArrays.h rename to MAC/APL/PAC/Cal_Server/src/SubArrays.h diff --git a/MAC/APL/PAC/CalServer/src/calinfo.cc b/MAC/APL/PAC/Cal_Server/src/calinfo.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/calinfo.cc rename to MAC/APL/PAC/Cal_Server/src/calinfo.cc diff --git a/MAC/APL/PAC/CalServer/src/calinfo.h b/MAC/APL/PAC/Cal_Server/src/calinfo.h similarity index 100% rename from MAC/APL/PAC/CalServer/src/calinfo.h rename to MAC/APL/PAC/Cal_Server/src/calinfo.h diff --git a/MAC/APL/PAC/CalServer/src/genacc.cc b/MAC/APL/PAC/Cal_Server/src/genacc.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/genacc.cc rename to MAC/APL/PAC/Cal_Server/src/genacc.cc diff --git a/MAC/APL/PAC/CalServer/src/juggle_acc.cc b/MAC/APL/PAC/Cal_Server/src/juggle_acc.cc similarity index 100% rename from MAC/APL/PAC/CalServer/src/juggle_acc.cc rename to MAC/APL/PAC/Cal_Server/src/juggle_acc.cc diff --git a/MAC/APL/PAC/CalServer/src/toaa.sh b/MAC/APL/PAC/Cal_Server/src/toaa.sh similarity index 100% rename from MAC/APL/PAC/CalServer/src/toaa.sh rename to MAC/APL/PAC/Cal_Server/src/toaa.sh diff --git a/MAC/APL/PAC/CalServer/test/CMakeLists.txt b/MAC/APL/PAC/Cal_Server/test/CMakeLists.txt similarity index 100% rename from MAC/APL/PAC/CalServer/test/CMakeLists.txt rename to MAC/APL/PAC/Cal_Server/test/CMakeLists.txt diff --git a/MAC/APL/PAC/CalServer/test/CalTest.cc b/MAC/APL/PAC/Cal_Server/test/CalTest.cc similarity index 100% rename from MAC/APL/PAC/CalServer/test/CalTest.cc rename to MAC/APL/PAC/Cal_Server/test/CalTest.cc diff --git a/MAC/APL/PAC/CalServer/test/CalTest.conf.in b/MAC/APL/PAC/Cal_Server/test/CalTest.conf.in similarity index 100% rename from MAC/APL/PAC/CalServer/test/CalTest.conf.in rename to MAC/APL/PAC/Cal_Server/test/CalTest.conf.in diff --git a/MAC/APL/PAC/CalServer/test/CalTest.h b/MAC/APL/PAC/Cal_Server/test/CalTest.h similarity index 100% rename from MAC/APL/PAC/CalServer/test/CalTest.h rename to MAC/APL/PAC/Cal_Server/test/CalTest.h diff --git a/MAC/APL/PAC/CalServer/test/Makefile.am b/MAC/APL/PAC/Cal_Server/test/Makefile.am similarity index 100% rename from MAC/APL/PAC/CalServer/test/Makefile.am rename to MAC/APL/PAC/Cal_Server/test/Makefile.am diff --git a/MAC/APL/PAC/lofarconf.in b/MAC/APL/PAC/lofarconf.in index a916918f98a1d92f0fc981959d90bd32bee78fc3..4264521ba9b02628bfd499d3d4e83deeaf6b5d0a 100644 --- a/MAC/APL/PAC/lofarconf.in +++ b/MAC/APL/PAC/lofarconf.in @@ -1,5 +1,5 @@ CAL_Protocol BS_Protocol -CalServer -BeamServer +Cal_Server +Beam_Server SHMInfoServer