PYROS-IRAP / pyros

Commit d722ad0417d9c7d43b1b20602015ef7454ceaadd

Authored by Alain Klotz
1 parent c3873996
Exists in dev

Draft of new yaml for fn_contexts.

Showing 4 changed files with 51 additions and 34 deletions   Show diff stats
Inline Side-by-side
config/pyros/config_pyros.yml
  Diff comments   View file @d722ad0
... ... @@ -4,17 +4,6 @@ general:
4 4 color_theme: sienna
5 5 nb_element_per_page: 20
6 6 fn_contexts:
7   - pyros_img_L0:
8   - root_dir: "data/images/"
9   - description: "pyros_img_L0"
10   - extension: ".fit"
11   - naming: "PyROS.img.1"
12   - pyros_img_L1:
13   - root_dir: "data/images/"
14   - description: "pyros_img_L1"
15   - extension: ".fits"
16   - pathnaming: "PyROS.img.1"
17   -
18 7 pyros_seq:
19 8 root_dir: "data/sequence/"
20 9 description: "pyros_seq"
... ...
privatedev/config/tnc/observatory_tnc.yml
  Diff comments   View file @d722ad0
... ... @@ -234,29 +234,36 @@ OBSERVATORY:
234 234 name: plc
235 235 computer: MainComputer
236 236 path: private/plugin/agent_devices
  237 +
  238 +
  239 + # ========== debut new
  240 + # ============================================
  241 + # Agents of the channel up1
237 242 # ============================================
238   - - AGENT_DEVICE:
239   - name: optic_up1
240   - computer: MainComputer
241   - path: ~
242   - device: Takahashi_Epsilon_180ED_001
243   - is_real: False
244 243  
245 244 - AGENT_DEVICE:
246   - name: focuser_up1
  245 + name: AD_focuser_up1
247 246 computer: MainComputer
248 247 path: private/plugin/agent_devices
249 248 device: Optec_TFC19740_001
250 249 is_real: False
251 250  
252 251 - AGENT_DEVICE:
253   - name: camera_up1
  252 + name: AD_camera_up1
254 253 computer: MainComputer
255 254 path: private/plugin/agent_devices
256 255 device: FLI_Kepler4040_001
257 256 protocol: private/plugin/agent_devices/camera_protocol.py
258 257 is_real: False
259 258  
  259 + # SF11-IPC (for AKz)
  260 + - AGENT:
  261 + name: AgentImagesProcessor_up1_akz
  262 + computer: AKlotzPersoComputer
  263 + protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
  264 +
  265 + # ========== fin new
  266 +
260 267 # ============================================
261 268 - AGENT_DEVICE:
262 269 name: optic_up2
... ... @@ -353,12 +360,6 @@ OBSERVATORY:
353 360 name: AgentImagesProcessor
354 361 computer: MainComputer
355 362  
356   - # SF11-IPC (for AKz)
357   - - AGENT:
358   - name: AgentImagesProcessor_tnc_up1_akz
359   - computer: AKlotzPersoComputer
360   - protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
361   -
362 363  
363 364 - AGENT:
364 365 name: AgentImagesProcessor_tnc_up1_ako
... ... @@ -494,15 +495,29 @@ OBSERVATORY:
494 495  
495 496 CHANNELS:
496 497  
  498 + # ========== debut new
497 499 - CHANNEL:
498 500 name: OpticalChannel_up1
499 501 symbol: CH1
500   - COMPONENT_AGENTS:
501   - - OpticImager: optic_up1
502   - - DetectorFocuser: focuser_up1
503   - - DetectorSensor: camera_up1
504   - - DetectorShutter: camera_up1
505   - - DetectorTimer: camera_up1
  502 + AGENTS:
  503 + AD_camera_up1
  504 + AD_focuser_up1
  505 + A_AgentImagesProcessor_up1_akz
  506 + COMPONENTS:
  507 + Takahashi_Epsilon_180ED_001
  508 + fn_contexts:
  509 + img_L0:
  510 + root_dir: "data/images/"
  511 + description: "pyros_img_L0"
  512 + extension: ".fit"
  513 + naming: "PyROS.img.1"
  514 + img_L1:
  515 + root_dir: "data/images/"
  516 + description: "pyros_img_L1"
  517 + extension: ".fits"
  518 + pathnaming: "PyROS.img.1"
  519 +
  520 + # ========== fin new
506 521  
507 522 - CHANNEL:
508 523 name: OpticalChannel_up2
... ...
pyros.py
  Diff comments   View file @d722ad0
... ... @@ -60,7 +60,7 @@ AGENTS = {
60 60 "AgentM": "monitoring",
61 61 "AgentSP": "scientific_programs",
62 62 "AgentScheduler": "scheduler",
63   - "agentImagesProcessor": "observation_manager",
  63 + "AgentImagesProcessor": "observation_manager",
64 64 "AgentImagesCalibrator": "observation_manager",
65 65 "agentSST": "agent",
66 66 "Agent": "agent",
... ...
src/core/pyros_django/observation_manager/AgentImagesProcessor.py
  Diff comments   View file @d722ad0
1 1 #!/usr/bin/env python3
2 2 #
3 3 # To launch this agent from the root of Pyros:
4   -# cd /srv/develop/pyros
5   -# .\PYROS -t start AgentImagesProcessor -o tnc -fg
  4 +#
  5 +# Linux console:
  6 +# cd /srv/develop/pyros/docker
  7 +# ./PYROS_DOCKER_START.sh
  8 +#
  9 +# Launch from Power Shell:
  10 +# To go from docker to Powershell: pyros_user@ORION:~/app$ exit (or Ctrl+d)
  11 +# Prompt is now PS ...>
  12 +# cd \srv\develop\pyros
  13 +# .\PYROS -t new-start -o tnc -fg -a AgentImagesProcessor_tmc_up1_akz
  14 +#
  15 +# Launch from docker:
  16 +# To go from Powershell to docker: PS ...> .\PYROS_DOCKER_SHELL
  17 +# Prompt is now pyros_user@ORION:~/app$
  18 +# ./PYROS -t new-start -o tnc -fg -a AgentImagesProcessor_tmc_up1_akz
6 19 #
7 20 # ---------------------------------------------------
8 21  
... ...