diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d13d80443913acd5f925563acc8a15c0110d17d..eef96688ba969a95709f27c6b0d96e226662d1e3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,7 +99,7 @@ docker_build_image_all: - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-apspu latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-tilebeam latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-beamlet latest - - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-DigitalBeam latest + - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-digitalbeam latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-boot latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-docker latest - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh device-observation_control latest diff --git a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py index 9a64688d744baaf4ebf0853d970e1afaea4a3018..7d9e76359be08fd117a231dbae7d91ee8ad5662b 100644 --- a/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py +++ b/docker-compose/jupyter/ipython-profiles/stationcontrol-jupyter/startup/01-devices.py @@ -11,6 +11,7 @@ tilebeam = DeviceProxy("STAT/TileBeam/1") beamlet = DeviceProxy("STAT/Beamlet/1") beamlet = DeviceProxy("STAT/DigitalBeam/1") docker = DeviceProxy("STAT/Docker/1") +digitalbeam = DeviceProxy("STAT/DigitalBeam/1") # Put them in a list in case one wants to iterate -devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, DigitalBeam, docker] +devices = [apsct, apspu, recv, sdp, sst, xst, unb2, boot, tilebeam, beamlet, digitalbeam, docker] diff --git a/sbin/run_integration_test.sh b/sbin/run_integration_test.sh index 3aea24ca376d982f5320a8f7911114f831e46cdc..f85ac1ab7eeef4f7d266b3a63b2f962b1c9f91f4 100755 --- a/sbin/run_integration_test.sh +++ b/sbin/run_integration_test.sh @@ -20,7 +20,7 @@ make build databaseds dsconfig elk integration-test make build archiver-timescale hdbppts-cm hdbppts-es # Start and stop sequence -make stop device-boot device-docker device-apsct device-apspu device-sdp device-recv device-sst device-unb2 device-xst device-beamlet device-DigitalBeam device-tilebeam sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim hdbppts-es hdbppts-cm archiver-timescale +make stop device-boot device-docker device-apsct device-apspu device-sdp device-recv device-sst device-unb2 device-xst device-beamlet device-digitalbeam device-tilebeam sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim hdbppts-es hdbppts-cm archiver-timescale make start databaseds dsconfig elk # Give dsconfig and databaseds time to start @@ -38,7 +38,7 @@ make start sdptr-sim recv-sim unb2-sim apsct-sim apspu-sim # Give the simulators time to start sleep 5 -make start device-boot device-apsct device-apspu device-sdp device-recv device-sst device-unb2 device-xst device-tilebeam device-beamlet device-DigitalBeam +make start device-boot device-apsct device-apspu device-sdp device-recv device-sst device-unb2 device-xst device-tilebeam device-beamlet device-digitalbeam # Archive devices -> starting order is important make start archiver-timescale hdbppts-cm hdbppts-es diff --git a/tangostationcontrol/docs/source/index.rst b/tangostationcontrol/docs/source/index.rst index ab4b696c0951c792570a8b02ce8e121309e6e9dd..97f8272100311a1b4cb758a4b47d3b9fc93d4e28 100644 --- a/tangostationcontrol/docs/source/index.rst +++ b/tangostationcontrol/docs/source/index.rst @@ -21,7 +21,7 @@ Even without having access to any LOFAR2.0 hardware, you can install the full st devices/using devices/tilebeam devices/beamlet - devices/DigitalBeam + devices/digitalbeam devices/boot devices/docker devices/recv diff --git a/tangostationcontrol/setup.cfg b/tangostationcontrol/setup.cfg index 6a438752e2ef458fa27aeaa2c07142dc73b8cf53..b2e170d29ade1949fbfc5c53b87b03eb8de0c409 100644 --- a/tangostationcontrol/setup.cfg +++ b/tangostationcontrol/setup.cfg @@ -37,7 +37,7 @@ console_scripts = l2ss-apspu = tangostationcontrol.devices.apspu:main l2ss-tilebeam = tangostationcontrol.devices.tilebeam:main l2ss-beamlet = tangostationcontrol.devices.sdp.beamlet:main - l2ss-DigitalBeam = tangostationcontrol.devices.sdp.DigitalBeam:main + l2ss-DigitalBeam = tangostationcontrol.devices.sdp.digitalbeam:main l2ss-boot = tangostationcontrol.devices.boot:main l2ss-docker-device = tangostationcontrol.devices.docker_device:main l2ss-observation = tangostationcontrol.devices.observation:main diff --git a/tangostationcontrol/tangostationcontrol/devices/sdp/DigitalBeam.py b/tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py similarity index 100% rename from tangostationcontrol/tangostationcontrol/devices/sdp/DigitalBeam.py rename to tangostationcontrol/tangostationcontrol/devices/sdp/digitalbeam.py