Commit 62159e801e1038e6864384090cfd2659c633988d

Authored by Alexis Koralewski
1 parent 9b04b9bd
Exists in dev

Adding image_calibration in tnc obs config

config/schemas/schema_observatory-2.0.yml
... ... @@ -133,6 +133,49 @@ schema;schema_CHANNEL:
133 133 sequence:
134 134 - type: any
135 135  
  136 +schema;schema_IMAGE_CALIBRATIONS:
  137 + type: map
  138 + mapping:
  139 + SERIES:
  140 + type: seq
  141 + sequence:
  142 + - type: map
  143 + mapping:
  144 + SERIE:
  145 + type: map
  146 + mapping:
  147 + when:
  148 + type: str
  149 + category:
  150 + type: str
  151 + name:
  152 + type: str
  153 + mount:
  154 + type: str
  155 + target:
  156 + type: str
  157 + CHANNELS:
  158 + type: seq
  159 + sequence:
  160 + - type: map
  161 + mapping:
  162 + CHANNEL:
  163 + type: map
  164 + mapping:
  165 + name:
  166 + type: str
  167 + filter:
  168 + type: str
  169 + shutter:
  170 + type: str
  171 + nb_images:
  172 + type: int
  173 + exptime:
  174 + type: float
  175 + binning:
  176 + type: str
  177 + valid_level_mean_minmax:
  178 + type: str
136 179  
137 180 schema;schema_SECURITY:
138 181 type: map
... ... @@ -164,7 +207,6 @@ schema;schema_TOPOLOGY:
164 207 include: schema_LAYOUTS
165 208  
166 209  
167   -
168 210 schema;schema_COMPUTER:
169 211 type: map
170 212 mapping:
... ... @@ -283,6 +325,8 @@ schema;schema_UNIT:
283 325 include: schema_TOPOLOGY
284 326 DEPENDENCIES:
285 327 include: schema_DEPENDENCIES
  328 + IMAGE_CALIBRATIONS:
  329 + include: schema_IMAGE_CALIBRATIONS
286 330  
287 331  
288 332 schema;schema_UNITS:
... ...
privatedev/config/tnc/observatory_tnc.yml
... ... @@ -213,7 +213,6 @@ OBSERVATORY:
213 213 name: plc
214 214 computer: MainComputer
215 215 path: private/plugin/agent_devices
216   -
217 216 # ============================================
218 217 - AGENT_DEVICE:
219 218 name: optic_up1
... ... @@ -357,13 +356,6 @@ OBSERVATORY:
357 356 computer: AKlotzPersoComputer
358 357 protocol: private/plugin/agent/AgentTriton.py
359 358 path: private/plugin/agent/triton
360   -
361   - - AGENT:
362   - name: AgentTriton_ep
363   - computer: EtienneComputer
364   - protocol: private/plugin/agent/AgentTriton.py
365   - path: private/plugin/agent/triton
366   -
367 359  
368 360 # AgentSST no protocol so AgentSST doesn't start himself
369 361 - AGENT:
... ... @@ -377,8 +369,8 @@ OBSERVATORY:
377 369  
378 370 - AGENT:
379 371 name: AgentSST3
380   - computer: EtienneComputer
381   -
  372 + computer: EtienneComputer
  373 +
382 374 TOPOLOGY:
383 375  
384 376 SECURITY:
... ... @@ -489,3 +481,186 @@ OBSERVATORY:
489 481 ALBUMS:
490 482 - Three
491 483 - One
  484 + IMAGE_CALIBRATIONS:
  485 +
  486 + SERIES:
  487 +
  488 + - SERIE:
  489 + when: dawn
  490 + category: BI
  491 + name: bias1
  492 + mount: TM350
  493 + target: "HADEC 12h 0d"
  494 +
  495 + CHANNELS:
  496 +
  497 + - CHANNEL:
  498 + name: OpticalChannel_up1
  499 + filter: None
  500 + shutter: closed
  501 + nb_images: 5
  502 + exptime: 0
  503 + binning: (1,1)
  504 + valid_level_mean_minmax: (10, 5000)
  505 +
  506 + - CHANNEL:
  507 + name: OpticalChannel_up2
  508 + filter: None
  509 + shutter: closed
  510 + nb_images: 5
  511 + exptime: 0
  512 + binning: (1,1)
  513 + valid_level_mean_minmax: (10, 5000)
  514 +
  515 + - CHANNEL:
  516 + name: OpticalChannel_down1
  517 + filter: None
  518 + shutter: closed
  519 + nb_images: 5
  520 + exptime: 0
  521 + binning: (1,1)
  522 + valid_level_mean_minmax: (10, 5000)
  523 +
  524 + - CHANNEL:
  525 + name: OpticalChannel_down2
  526 + filter: None
  527 + shutter: closed
  528 + nb_images: 5
  529 + exptime: 0
  530 + binning: (1,1)
  531 + valid_level_mean_minmax: (10, 5000)
  532 +
  533 + - SERIE:
  534 + when: dawn
  535 + category: DA
  536 + name: dark100s
  537 + mount: TM350
  538 + target: "HADEC 12h 0d"
  539 +
  540 + CHANNELS:
  541 +
  542 + - CHANNEL:
  543 + name: OpticalChannel_up1
  544 + filter: None
  545 + shutter: closed
  546 + nb_images: 5
  547 + exptime: 100
  548 + binning: (1,1)
  549 + valid_level_mean_minmax: (10, 5000)
  550 +
  551 + - CHANNEL:
  552 + name: OpticalChannel_up2
  553 + filter: None
  554 + shutter: closed
  555 + nb_images: 5
  556 + exptime: 100
  557 + binning: (1,1)
  558 + valid_level_mean_minmax: (10, 5000)
  559 +
  560 + - CHANNEL:
  561 + name: OpticalChannel_down1
  562 + filter: None
  563 + shutter: closed
  564 + nb_images: 5
  565 + exptime: 100
  566 + binning: (1,1)
  567 + valid_level_mean_minmax: (10, 5000)
  568 +
  569 + - CHANNEL:
  570 + name: OpticalChannel_down2
  571 + filter: None
  572 + shutter: closed
  573 + nb_images: 5
  574 + exptime: 100
  575 + binning: (1,1)
  576 + valid_level_mean_minmax: (10, 5000)
  577 +
  578 + - SERIE:
  579 + when: dawn
  580 + category: DA
  581 + name: dark10s
  582 + mount: TM350
  583 + target: "HADEC 12h 0d"
  584 +
  585 + CHANNELS:
  586 +
  587 + - CHANNEL:
  588 + name: OpticalChannel_up1
  589 + filter: None
  590 + shutter: closed
  591 + nb_images: 5
  592 + exptime: 10
  593 + binning: (1,1)
  594 + valid_level_mean_minmax: (10, 5000)
  595 +
  596 + - CHANNEL:
  597 + name: OpticalChannel_up2
  598 + filter: None
  599 + shutter: closed
  600 + nb_images: 5
  601 + exptime: 10
  602 + binning: (1,1)
  603 + valid_level_mean_minmax: (10, 5000)
  604 +
  605 + - CHANNEL:
  606 + name: OpticalChannel_down1
  607 + filter: None
  608 + shutter: closed
  609 + nb_images: 5
  610 + exptime: 10
  611 + binning: (1,1)
  612 + valid_level_mean_minmax: (10, 5000)
  613 +
  614 + - CHANNEL:
  615 + name: OpticalChannel_down2
  616 + filter: None
  617 + shutter: closed
  618 + nb_images: 5
  619 + exptime: 10
  620 + binning: (1,1)
  621 + valid_level_mean_minmax: (10, 5000)
  622 +
  623 + - SERIE:
  624 + when: dawn
  625 + category: FL
  626 + name: flat
  627 + mount: TM350
  628 + target: "HADEC 12h 0d"
  629 +
  630 + CHANNELS:
  631 +
  632 + - CHANNEL:
  633 + name: OpticalChannel_up1
  634 + filter: None
  635 + shutter: opened
  636 + nb_images: 5
  637 + exptime: 1
  638 + binning: (1,1)
  639 + valid_level_mean_minmax: (8000, 50000)
  640 +
  641 + - CHANNEL:
  642 + name: OpticalChannel_up2
  643 + filter: None
  644 + shutter: opened
  645 + nb_images: 5
  646 + exptime: 1
  647 + binning: (1,1)
  648 + valid_level_mean_minmax: (8000, 50000)
  649 +
  650 + - CHANNEL:
  651 + name: OpticalChannel_down1
  652 + filter: None
  653 + shutter: opened
  654 + nb_images: 5
  655 + exptime: 1
  656 + binning: (1,1)
  657 + valid_level_mean_minmax: (8000, 50000)
  658 +
  659 + - CHANNEL:
  660 + name: OpticalChannel_down2
  661 + filter: None
  662 + shutter: opened
  663 + nb_images: 5
  664 + exptime: 1
  665 + binning: (1,1)
  666 + valid_level_mean_minmax: (8000, 50000)
... ...