diff --git a/config/schemas/schema_observatory-2.0.yml b/config/schemas/schema_observatory-2.0.yml index d887deb..b56f50f 100644 --- a/config/schemas/schema_observatory-2.0.yml +++ b/config/schemas/schema_observatory-2.0.yml @@ -133,6 +133,49 @@ schema;schema_CHANNEL: sequence: - type: any +schema;schema_IMAGE_CALIBRATIONS: + type: map + mapping: + SERIES: + type: seq + sequence: + - type: map + mapping: + SERIE: + type: map + mapping: + when: + type: str + category: + type: str + name: + type: str + mount: + type: str + target: + type: str + CHANNELS: + type: seq + sequence: + - type: map + mapping: + CHANNEL: + type: map + mapping: + name: + type: str + filter: + type: str + shutter: + type: str + nb_images: + type: int + exptime: + type: float + binning: + type: str + valid_level_mean_minmax: + type: str schema;schema_SECURITY: type: map @@ -164,7 +207,6 @@ schema;schema_TOPOLOGY: include: schema_LAYOUTS - schema;schema_COMPUTER: type: map mapping: @@ -283,6 +325,8 @@ schema;schema_UNIT: include: schema_TOPOLOGY DEPENDENCIES: include: schema_DEPENDENCIES + IMAGE_CALIBRATIONS: + include: schema_IMAGE_CALIBRATIONS schema;schema_UNITS: diff --git a/privatedev/config/tnc/observatory_tnc.yml b/privatedev/config/tnc/observatory_tnc.yml index e4f803d..b35af56 100644 --- a/privatedev/config/tnc/observatory_tnc.yml +++ b/privatedev/config/tnc/observatory_tnc.yml @@ -213,7 +213,6 @@ OBSERVATORY: name: plc computer: MainComputer path: private/plugin/agent_devices - # ============================================ - AGENT_DEVICE: name: optic_up1 @@ -357,13 +356,6 @@ OBSERVATORY: computer: AKlotzPersoComputer protocol: private/plugin/agent/AgentTriton.py path: private/plugin/agent/triton - - - AGENT: - name: AgentTriton_ep - computer: EtienneComputer - protocol: private/plugin/agent/AgentTriton.py - path: private/plugin/agent/triton - # AgentSST no protocol so AgentSST doesn't start himself - AGENT: @@ -377,8 +369,8 @@ OBSERVATORY: - AGENT: name: AgentSST3 - computer: EtienneComputer - + computer: EtienneComputer + TOPOLOGY: SECURITY: @@ -489,3 +481,186 @@ OBSERVATORY: ALBUMS: - Three - One + IMAGE_CALIBRATIONS: + + SERIES: + + - SERIE: + when: dawn + category: BI + name: bias1 + mount: TM350 + target: "HADEC 12h 0d" + + CHANNELS: + + - CHANNEL: + name: OpticalChannel_up1 + filter: None + shutter: closed + nb_images: 5 + exptime: 0 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_up2 + filter: None + shutter: closed + nb_images: 5 + exptime: 0 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_down1 + filter: None + shutter: closed + nb_images: 5 + exptime: 0 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_down2 + filter: None + shutter: closed + nb_images: 5 + exptime: 0 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - SERIE: + when: dawn + category: DA + name: dark100s + mount: TM350 + target: "HADEC 12h 0d" + + CHANNELS: + + - CHANNEL: + name: OpticalChannel_up1 + filter: None + shutter: closed + nb_images: 5 + exptime: 100 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_up2 + filter: None + shutter: closed + nb_images: 5 + exptime: 100 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_down1 + filter: None + shutter: closed + nb_images: 5 + exptime: 100 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_down2 + filter: None + shutter: closed + nb_images: 5 + exptime: 100 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - SERIE: + when: dawn + category: DA + name: dark10s + mount: TM350 + target: "HADEC 12h 0d" + + CHANNELS: + + - CHANNEL: + name: OpticalChannel_up1 + filter: None + shutter: closed + nb_images: 5 + exptime: 10 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_up2 + filter: None + shutter: closed + nb_images: 5 + exptime: 10 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_down1 + filter: None + shutter: closed + nb_images: 5 + exptime: 10 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - CHANNEL: + name: OpticalChannel_down2 + filter: None + shutter: closed + nb_images: 5 + exptime: 10 + binning: (1,1) + valid_level_mean_minmax: (10, 5000) + + - SERIE: + when: dawn + category: FL + name: flat + mount: TM350 + target: "HADEC 12h 0d" + + CHANNELS: + + - CHANNEL: + name: OpticalChannel_up1 + filter: None + shutter: opened + nb_images: 5 + exptime: 1 + binning: (1,1) + valid_level_mean_minmax: (8000, 50000) + + - CHANNEL: + name: OpticalChannel_up2 + filter: None + shutter: opened + nb_images: 5 + exptime: 1 + binning: (1,1) + valid_level_mean_minmax: (8000, 50000) + + - CHANNEL: + name: OpticalChannel_down1 + filter: None + shutter: opened + nb_images: 5 + exptime: 1 + binning: (1,1) + valid_level_mean_minmax: (8000, 50000) + + - CHANNEL: + name: OpticalChannel_down2 + filter: None + shutter: opened + nb_images: 5 + exptime: 1 + binning: (1,1) + valid_level_mean_minmax: (8000, 50000) -- libgit2 0.21.2