PYROS-IRAP / pyros

Commit 6d807cd73765936311bc624236af99c258751174

Authored by Alexis Koralewski
1 parent d722ad04
Exists in dev

Update Obsconfig schema to add components & agents to channels config

Showing 3 changed files with 128 additions and 29 deletions   Show diff stats
Inline Side-by-side
CHANGELOG
  Diff comments   View file @6d807cd
  1 +22-05-2023 (AKo): V0.6.24.0
  2 + - Update Obsconfig schema to add components & agents to channels config
  3 +
  4 +05-05-2023 (AKo): v0.6.23.0
  5 + - Update dockerfile (Upgrading to Ubuntu 22.04 & python 3.10) & requirements files
  6 + - Upgrade vuejs version (3.2.47)
  7 +
  8 +
1 9 25-04-2023 (AKo): v0.6.22.0
2 10 - Add ephem to pickle seq & add pickle creation when submitting seq via api
3 11 - Add Filenames to ConfigPyros & add fn_contexts in config_pyros.yml
... ...
config/schemas/schema_observatory-2.0.yml
  Diff comments   View file @6d807cd
... ... @@ -139,11 +139,62 @@ schema;schema_CHANNEL:
139 139 name:
140 140 type: str
141 141 required: True
142   - COMPONENT_AGENTS:
  142 + COMPONENTS:
143 143 type: seq
144   - required: True
  144 + required: False
145 145 sequence:
146 146 - type: any
  147 + AGENTS:
  148 + type: seq
  149 + required: False
  150 + sequence:
  151 + - type: any
  152 + fn_contexts:
  153 + type: map
  154 + required: True
  155 + mapping:
  156 + img_L0:
  157 + type: map
  158 + required: False
  159 + mapping:
  160 + root_dir:
  161 + type: str
  162 + description:
  163 + type: str
  164 + extension:
  165 + type: str
  166 + naming:
  167 + type: str
  168 + pathnaming:
  169 + type: str
  170 + img_L1:
  171 + type: map
  172 + required: False
  173 + mapping:
  174 + root_dir:
  175 + type: str
  176 + description:
  177 + type: str
  178 + extension:
  179 + type: str
  180 + naming:
  181 + type: str
  182 + pathnaming:
  183 + type: str
  184 + pyros_seq:
  185 + type: map
  186 + required: False
  187 + mapping:
  188 + root_dir:
  189 + type: str
  190 + description:
  191 + type: str
  192 + extension:
  193 + type: str
  194 + naming:
  195 + type: str
  196 + pathnaming:
  197 + type: str
147 198  
148 199 schema;schema_IMAGE_CALIBRATIONS:
149 200 type: map
... ...
privatedev/config/tnc/observatory_tnc.yml
  Diff comments   View file @6d807cd
... ... @@ -187,15 +187,22 @@ OBSERVATORY:
187 187 links:
188 188 - link:
189 189 type: git
190   - name: guitastro_mount_astromecca
191   - url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_mount_astromecca
  190 + name: guitastro_device_astromecca
  191 + url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_device_astromecca
192 192 install:
193 193 shell: /bin/sh
194 194 script: "guitastro/install/install.sh"
195 195 - link:
196 196 type: git
197   - name: guitastro_camera_indi
198   - url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_camera_indi
  197 + name: guitastro_device_optec
  198 + url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_device_optec
  199 + install:
  200 + shell: /bin/sh
  201 + script: "guitastro/install/install.sh"
  202 + - link:
  203 + type: git
  204 + name: guitastro_device_indi
  205 + url: https://gitlab.irap.omp.eu/guitastrolib/guitastro_device_indi
199 206 install:
200 207 shell: /bin/sh
201 208 script: "guitastro/install/install.sh"
... ... @@ -500,11 +507,11 @@ OBSERVATORY:
500 507 name: OpticalChannel_up1
501 508 symbol: CH1
502 509 AGENTS:
503   - AD_camera_up1
504   - AD_focuser_up1
505   - A_AgentImagesProcessor_up1_akz
  510 + - AD_camera_up1
  511 + - AD_focuser_up1
  512 + - A_AgentImagesProcessor_up1_akz
506 513 COMPONENTS:
507   - Takahashi_Epsilon_180ED_001
  514 + - Takahashi_Epsilon_180ED_001
508 515 fn_contexts:
509 516 img_L0:
510 517 root_dir: "data/images/"
... ... @@ -522,32 +529,65 @@ OBSERVATORY:
522 529 - CHANNEL:
523 530 name: OpticalChannel_up2
524 531 symbol: CH2
525   - COMPONENT_AGENTS:
526   - - OpticImager: optic_up2
527   - - DetectorFocuser: focuser_up2
528   - - DetectorSensor: camera_up2
529   - - DetectorShutter: camera_up2
530   - - DetectorTimer: camera_up2
531   -
  532 + AGENTS:
  533 + - focuser_up2
  534 + - camera_up2
  535 + #- A_AgentImagesProcessor_up2_akz
  536 + COMPONENTS:
  537 + - Takahashi_Epsilon_180ED_002
  538 + fn_contexts:
  539 + img_L0:
  540 + root_dir: "data/images/"
  541 + description: "pyros_img_L0"
  542 + extension: ".fit"
  543 + naming: "PyROS.img.1"
  544 + img_L1:
  545 + root_dir: "data/images/"
  546 + description: "pyros_img_L1"
  547 + extension: ".fits"
  548 + pathnaming: "PyROS.img.1"
  549 +
532 550 - CHANNEL:
533 551 name: OpticalChannel_down1
534 552 symbol: CH3
535   - COMPONENT_AGENTS:
536   - - OpticImager: optic_down1
537   - - DetectorFocuser: focuser_down1
538   - - DetectorSensor: camera_down1
539   - - DetectorShutter: camera_down1
540   - - DetectorTimer: camera_down1
  553 + AGENTS:
  554 + - focuser_down
  555 + - camera_down1
  556 + #- A_AgentImagesProcessor_down1_akz
  557 + COMPONENTS:
  558 + - Takahashi_Epsilon_180ED_003
  559 + fn_contexts:
  560 + img_L0:
  561 + root_dir: "data/images/"
  562 + description: "pyros_img_L0"
  563 + extension: ".fit"
  564 + naming: "PyROS.img.1"
  565 + img_L1:
  566 + root_dir: "data/images/"
  567 + description: "pyros_img_L1"
  568 + extension: ".fits"
  569 + pathnaming: "PyROS.img.1"
541 570  
542 571 - CHANNEL:
543 572 name: OpticalChannel_down2
544 573 symbol: CH4
545   - COMPONENT_AGENTS:
546   - - OpticImager: optic_down2
547   - - DetectorFocuser: focuser_down2
548   - - DetectorSensor: camera_down2
549   - - DetectorShutter: camera_down2
550   - - DetectorTimer: camera_down2
  574 + AGENTS:
  575 + - focuser_down2
  576 + - camera_down2
  577 + #- A_AgentImagesProcessor_down2_akz
  578 + COMPONENTS:
  579 + - Takahashi_Epsilon_180ED_004
  580 + fn_contexts:
  581 + img_L0:
  582 + root_dir: "data/images/"
  583 + description: "pyros_img_L0"
  584 + extension: ".fit"
  585 + naming: "PyROS.img.1"
  586 + img_L1:
  587 + root_dir: "data/images/"
  588 + description: "pyros_img_L1"
  589 + extension: ".fits"
  590 + pathnaming: "PyROS.img.1"
551 591  
552 592 ALBUMS:
553 593  
... ...