Merge branch 'develop'

* develop: Add compose files for atptg and attcs. Add readme for some places. Add compose for DIMM. Hexapod ip fixed Updated simulators Add serial port to device Add serial port configuration to electrometer and README file Add changes to README file Add X11 from local computer to docker-compose for electrometer Rename Hexapod to ATHexapod, Add Electrometer CSC
lsst-it · Jul 11, 2019 · 8b70d15 · 8b70d15
2 parents 5c1924b + fdb2868
commit 8b70d15
Show file tree

Hide file tree

Showing 22 changed files with 300 additions and 85 deletions.
diff --git a/AT_CSC/ATDome/README.md b/AT_CSC/ATDome/README.md
@@ -0,0 +1 @@
+This compose will start the ATDome CSC that talks to the real hardware.
diff --git a/AT_CSC/ATDome/docker-compose.yaml b/AT_CSC/ATDome/docker-compose.yaml
@@ -3,8 +3,8 @@ version: '3.6'
 services:
 
     atdome-csc:
-        image: lsstts/at_dome_sim:3.9-0.5
-        container_name: atdome-sim
+        image: lsstts/at_dome:3.9-0.5
+        container_name: atdome
         environment:
             - OSPL_URI=${OSPL_URI}
             - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
@@ -14,3 +14,15 @@ services:
 
         entrypoint: ["/home/saluser/.setup.sh"]
 
+    atdometrajectory-sim:
+        image: lsstts/at_dome_trajectory_sim:3.9-0.6a
+        container_name: atdometrajectory
+        environment:
+            - OSPL_URI=${OSPL_URI}
+            - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+        network_mode: "host"
+        volumes:
+            - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+
+        entrypoint: ["/home/saluser/.setup.sh"]
+
diff --git a/AT_CSC/Hexapod/docker-compose.yaml → AT_CSC/ATHexapod/docker-compose.yaml b/AT_CSC/Hexapod/docker-compose.yaml → AT_CSC/ATHexapod/docker-compose.yaml
@@ -2,20 +2,21 @@ version: "3"
 
 services:
         HexapodCSC:
-                image: lsstts/ts_athexapod
+                image: lsstts/ts_athexapod:3.9-dm-19762
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                        - OSPL_URI=${OSPL_URI}
                 network_mode: "host"
                 volumes:
                         - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
                         - ./startCSC.sh:/home/saluser/startCSC.sh
                         - ./tcpConfiguration.yaml:/home/saluser/repos/ts_salobjATHexapod/bin/settingFiles/Test/1/tcpConfiguration.yaml
                 entrypoint: ["/home/saluser/startCSC.sh"]
         HexapodGUI:
-                image: lsstts/ts_athexapod
+                image: lsstts/ts_athexapod:3.9-dm-19762
                 environment:
                         - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
-                        - DISPLAY=139.229.136.136:0
+                        - DISPLAY=192.168.1.51:0
                 network_mode: "host"
                 volumes:
                         - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}

diff --git a/AT_CSC/ATHexapod/startCSC.sh b/AT_CSC/ATHexapod/startCSC.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+echo "#"
+echo "# Loading LSST Stack"
+. /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+. repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+setup ts_salobjATHexapod -t current
+cd /home/saluser/repos/ts_salobjATHexapod/bin/
+while :
+    do
+        echo "# Starting CSC"
+        python ./runATHexapodCSC.py 0
+	echo "# CSC finished..."
+done
diff --git a/AT_CSC/Hexapod/startGUI.sh → AT_CSC/ATHexapod/startGUI.sh b/AT_CSC/Hexapod/startGUI.sh → AT_CSC/ATHexapod/startGUI.sh
diff --git a/AT_CSC/Hexapod/tcpConfiguration.yaml → AT_CSC/ATHexapod/tcpConfiguration.yaml b/AT_CSC/Hexapod/tcpConfiguration.yaml → AT_CSC/ATHexapod/tcpConfiguration.yaml
@@ -1,4 +1,4 @@
-host: "192.168.1.31"
+host: "192.168.1.48"
 port: 50000
 connectionTimeout: 2
 readTimeout: 2

diff --git a/AT_CSC/ATPTG/docker-compose.yaml b/AT_CSC/ATPTG/docker-compose.yaml
@@ -0,0 +1,11 @@
+version: '3.6'
+services:
+  atptg:
+    image: tiagorib/ptkernel:DM-19890
+    container_name: atptg
+    environment:
+      - OSPL_URI=${OSPL_URI}
+      - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+    network_mode: "host"
+    volumes:
+      - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
diff --git a/AT_CSC/ATTCS/docker-compose.yaml b/AT_CSC/ATTCS/docker-compose.yaml
@@ -0,0 +1,40 @@
+version: '3.6'
+
+services:
+
+    ataos:
+        image: lsstts/ataos:DM-19890
+        container_name: ataos
+        environment:
+            - OSPL_URI=${OSPL_URI}
+            - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+        network_mode: "host"
+        volumes:
+            - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+
+        entrypoint: ["/home/saluser/.setup.sh"]
+
+    atdome-csc:
+        image: lsstts/at_dome:3.9-0.5
+        container_name: atdome
+        environment:
+            - OSPL_URI=${OSPL_URI}
+            - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+        network_mode: "host"
+        volumes:
+            - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+
+        entrypoint: ["/home/saluser/.setup.sh"]
+
+    atdometrajectory-sim:
+        image: lsstts/at_dome_trajectory_sim:3.9-0.6a
+        container_name: atdometrajectory
+        environment:
+            - OSPL_URI=${OSPL_URI}
+            - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+        network_mode: "host"
+        volumes:
+            - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+
+        entrypoint: ["/home/saluser/.setup.sh"]
+
diff --git a/AT_CSC/Electrometer/docker-compose.yaml b/AT_CSC/Electrometer/docker-compose.yaml
@@ -0,0 +1,28 @@
+version: "3"
+
+services:
+        ElectrometerCSC:
+                image: lsstts/electrometer
+                environment:
+                        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                network_mode: "host"
+                volumes:
+                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+                        - ./startCSC.sh:/home/saluser/startCSC.sh
+                        - ./mainSetup.yaml:/home/saluser/repos/ts_electrometer2/bin/settingFiles/mainSetup.yaml
+                devices:
+                        - /dev/ttyUSB0:/dev/ttyUSB0
+                        - /dev/electrometer:/dev/electrometer
+                entrypoint: ["/home/saluser/startCSC.sh"]
+        ElectrometerGUI:
+                image: lsstts/electrometer
+                environment:
+                        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                        - DISPLAY=${DISPLAY}
+                network_mode: "host"
+                volumes:
+                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+                        - ./startGUI.sh:/home/saluser/startGUI.sh
+                        - /tmp/.X11-unix:/tmp/.X11-unix
+                        - ./mainSetup.yaml:/home/saluser/repos/ts_electrometer2/bin/settingFiles/mainSetup.yaml
+                entrypoint: ["/home/saluser/startGUI.sh"]
diff --git a/AT_CSC/Electrometer/mainSetup.yaml b/AT_CSC/Electrometer/mainSetup.yaml
@@ -0,0 +1,16 @@
+recommendedSettings:
+    - "Default1"
+    - "Default2"
+aliases:
+    Default1:
+        settingSet: "Test"
+        settingVersion: 1
+    Default2:
+        settingSet: "Test"
+        settingVersion: 2
+salId: 1
+filePath: "/home/saluser/ts_electrometer2/electrometerFitsFiles"
+simulated: 0
+httpHost: "10.0.100.133"
+port: 8000
+
diff --git a/AT_CSC/Electrometer/startCSC.sh b/AT_CSC/Electrometer/startCSC.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+echo "#"
+echo "# Loading LSST Stack"
+. /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+. repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+setup ts_electrometer -t current
+
+cd /home/saluser/repos/ts_electrometer2/bin/
+echo "# Starting CSC"
+python ./RunElectrometer.py 1
diff --git a/AT_CSC/Electrometer/startGUI.sh b/AT_CSC/Electrometer/startGUI.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+echo "#"
+echo "# Loading LSST Stack"
+. /opt/lsst/software/stack/loadLSST.bash
+setup lsst_distrib
+echo "#"
+echo "# Loading sal environment"
+. repos/ts_sal/setup.env
+echo "#"
+echo "# Setting up sal, salobj and scriptqueue"
+
+setup ts_xml -t current
+setup ts_sal -t current
+setup ts_salobj -t current
+setup ts_scriptqueue -t current
+setup ts_electrometer -t current
+cd /home/saluser/repos/ts_electrometer2/python/lsst/ts/electrometer/electrometerEUI
+echo "# Starting GUI"
+python ./EUI.py
diff --git a/AT_CSC/README.md b/AT_CSC/README.md
@@ -0,0 +1 @@
+Compose files for CSCs that talk to real hardware. No simmmulators! 
diff --git a/AT_EFD/docker-compose.yaml b/AT_EFD/docker-compose.yaml
@@ -5,6 +5,7 @@ services:
                 image: lsstts/efd_writers
                 volumes:
                         - ./efd_population.sh:/home/saluser/efd_population.sh
+                network_mode: "host"
                 entrypoint: ["/home/saluser/efd_population.sh"]
 
         EFD_MariaDB:
@@ -17,6 +18,7 @@ services:
                         - MYSQL_USER=efduser
                         - MYSQL_PASSWORD=lssttest
                 restart: on-failure
+                network_mode: "host"
                 #volumes:
                         #- ${PWD}/mariadb:/var/lib/mysql
         EFD_ATDome:

diff --git a/AT_Simulators/docker-compose.yaml b/AT_Simulators/docker-compose.yaml
@@ -50,7 +50,7 @@ services:
         entrypoint: ["/home/saluser/.setup.sh"]
 
     ataos-sim:
-        image: lsstts/ataos:v0.2.1
+        image: lsstts/ataos:DM-19890
         container_name: ataos-sim
         environment:
             - OSPL_URI=${OSPL_URI}
@@ -62,15 +62,32 @@ services:
         entrypoint: ["/home/saluser/.setup.sh"]
 
     atptg-sim:
-        image: tiagorib/ptkernel:new_xml
+        image: tiagorib/ptkernel:develop
         container_name: atptg-sim
         environment:
             - OSPL_URI=${OSPL_URI}
             - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
         network_mode: "host"
         volumes:
             - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+
+    hexapod-sim:
+        image: couger01/hexapod_simulator
+        container_name: hexapod-sim
+        network_mode: "host"
 
+    athexapod-sim:
+      image: lsstts/ts_athexapod:3.9-dm-19762
+      container_name: athexapod-sim
+      environment:
+        - OSPL_URI=${OSPL_URI}
+        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+      network_mode: "host"
+      volumes:
+        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+        - ./startCSC.sh:/home/saluser/startCSC.sh
+        - ./tcpConfiguration.yaml:/home/saluser/repos/ts_salobjATHexapod/bin/settingFiles/Test/1/tcpConfiguration.yaml
+      entrypoint: ["/home/saluser/startCSC.sh"]
 
     simulation-tests:
          image: lsstts/simulation_tests:latest

diff --git a/AT_CSC/Hexapod/startCSC.sh → AT_Simulators/startCSC.sh b/AT_CSC/Hexapod/startCSC.sh → AT_Simulators/startCSC.sh
diff --git a/AT_Simulators/tcpConfiguration.yaml b/AT_Simulators/tcpConfiguration.yaml
@@ -0,0 +1,7 @@
+host: "192.168.1.21"
+port: 50000
+connectionTimeout: 2
+readTimeout: 2
+sendTimeout: 2
+endStr: "endl"
+maxLength: 1024
diff --git a/DIMM/config.yaml b/DIMM/config.yaml
@@ -0,0 +1,46 @@
+
+settingVersions:
+  recommendedSettingsVersion: 'default'
+  recommendedSettingsLabels: ['default', 'simulation', 'soar', 'lsst']
+
+setting:
+  default:
+    type: 'sim'
+    configuration:
+      avg_seeing: 0.5  # average seeing (arcsec)
+      std_seeing: 0.1  # standard deviation (arcsec)
+      chance_failure: 0.0  # chance that the dimm will fail (in 1/100)
+      time_in_target:  # in hours
+        min: 2
+        max: 6
+      exposure_time: # in seconds
+        min: 30
+        max: 300
+        std: 5  # random deviation from actual value
+  simulation:
+    type: 'sim'
+    configuration:
+      avg_seeing: 0.5  # average seeing (arcsec)
+      std_seeing: 0.1  # standard deviation (arcsec)
+      chance_failure: 0.0  # chance that the dimm will fail (in 1/100)
+      time_in_target:  # in hours
+        min: 2
+        max: 6
+      exposure_time: # in seconds
+        min: 1
+        max: 3
+        std: 0.1  # random deviation from actual value
+  soar:
+    type: 'soar'
+    configuration:
+      uri: 'mysql://becs:[email protected]/pachon'
+      check_interval: 180.
+  lsst:
+    type: 'astelco'
+    configuration:
+      host: 192.168.1.250 
+      port: 16500
+      auto_auth: True
+      user: admin
+      password: admin
+
diff --git a/DIMM/docker-compose.yaml b/DIMM/docker-compose.yaml
@@ -0,0 +1,13 @@
+version: "3"
+
+services:
+        dimm:
+                image: lsstts/dimm:DM-19900
+                environment:
+                        - OSPL_URI=${OSPL_URI}
+                        - LSST_DDS_DOMAIN=${LSST_DDS_DOMAIN}
+                network_mode: "host"
+                container_name: dimm
+                volumes:
+                        - ${OSPL_CONFIG_PATH}:${OSPL_MOUNT_POINT}
+                        - ./config.yaml:/home/saluser/repos/ts_dimm/python/lsst/ts/dimm/config/config.yaml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This compose will start the ATDome CSC that talks to the real hardware.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Compose files for CSCs that talk to real hardware. No simmmulators!