Commit 613d1a94 authored by PONCELET's avatar PONCELET
Browse files

update model to reflect Pull Request #22 on github

parent 14ec615e
......@@ -1482,7 +1482,7 @@
"attributes": [
{
"name": "long_name",
"value": "Platform heading (true)"
"value": "Platform heading(true)"
},
{
"name": "standard_name",
......@@ -1518,64 +1518,10 @@
}
]
},
{
"name": "yaw",
"obligation": "M",
"comment": "Platform yaw in VCS coordinate system",
"dims": [
"timeDim"
],
"type": "float",
"attributes": [
{
"name": "crs",
"value": "VCS"
},
{
"name": "standard_name",
"value": "platform_yaw_angle"
},
{
"name": "units",
"value": "degree"
},
{
"name": "long_name",
"value": "yaw angle"
}
]
},
{
"name": "yaw_rate",
"obligation": "O",
"comment": "Platform yaw rate",
"dims": [
"timeDim"
],
"type": "float",
"attributes": [
{
"name": "crs",
"value": "VCS"
},
{
"name": "standard_name",
"value": "platform_yaw_rate"
},
{
"name": "units",
"value": "degree/s"
},
{
"name": "long_name",
"value": "yaw rate"
}
]
},
{
"name": "pitch",
"obligation": "M",
"comment": "Platform pitch in VCS coordinate system",
"comment": "Platform pitch. Positive values indicate a bow-up pitch.",
"dims": [
"timeDim"
],
......@@ -1634,7 +1580,7 @@
{
"name": "roll",
"obligation": "M",
"comment": "Platform roll in VCS coordinate system",
"comment": "Platform roll. Positive values indicate a roll to starboard.",
"dims": [
"timeDim"
],
......@@ -1918,12 +1864,6 @@
"obligation": "MA",
"comment": "Index of the position sensor to use by default. If the sensor used can be dynamically changed, refer to the variable active_position_sensor. Index matches the ones used in the Platform position sensors variables.",
"type": "int"
},
{
"name": "beam_stabilisation",
"obligation": "M",
"comment": "Indicate if beam are stabilized from ship motion or not",
"type": "beam_stabilisation_t"
}
],
"variables": [
......@@ -2152,10 +2092,10 @@
{
"name": "tx_beam_direction_x",
"obligation": "M",
"comment": "The _x_-axis coordinate of a unit vector in the tx_beam direction for each beam and ping in the FACS coordinate system (ie relative to the vertical)",
"comment": "The _x_-axis coordinate of a unit vector in the beam direction for each tx_beam and ping, as per the sonar beam coordinate system.",
"dims": [
"ping_timeDim",
"beamDim"
"tx_beamDim"
],
"type": "float",
"attributes": [
......@@ -2164,8 +2104,8 @@
"value": "_x_-component of the vector that gives the pointing direction of the tx_beam, in sonar beam coordinate system"
},
{
"name": "crs",
"value": "FACS"
"name": "units",
"value": "1"
},
{
"name": "valid_range",
......@@ -2177,57 +2117,32 @@
{
"name": "tx_beam_direction_y",
"obligation": "M",
"comment": "The _y_-axis coordinate of a unit vector in the beam direction for each tx_beam and ping, in the FACS coordinate system (ie relative to the vertical)",
"comment": "The _y_-axis coordinate of a unit vector in the tx_beam direction for each beam and ping, as per the sonar beam coordinate system.",
"dims": [
"ping_timeDim",
"beamDim"
"tx_beamDim"
],
"type": "float",
"attributes": [
{
"name": "long_name",
"value": "_y_-component of the vector that gives the pointing direction of the tx_beam, in the FACS coordinate system (ie relative to the vertical)"
},
{
"name": "valid_range",
"value": "-1.0f, 1.0f",
"type": "float"
"value": "_y_-component of the vector that gives the pointing direction of the tx_beam, in sonar beam coordinate system"
},
{
"name": "crs",
"value": "FACS"
}
]
},
{
"name": "tx_beam_direction_z",
"obligation": "M",
"comment": "The _z_-axis coordinate of a unit vector in the tx_beam direction for each beam and ping, in the FACS coordinate system (ie relative to the vertical)",
"dims": [
"ping_timeDim",
"beamDim"
],
"type": "float",
"attributes": [
{
"name": "long_name",
"value": "_z_-component of the vector that gives the pointing direction of the tx_beam, in the FACS coordinate system (ie relative to the vertical)"
"name": "units",
"value": "1"
},
{
"name": "valid_range",
"value": "-1.0f, 1.0f",
"type": "float"
},
{
"name": "crs",
"value": "FACS"
}
]
},
{
"name": "tx_tilt_angle",
"name": "tx_beam_direction_z",
"obligation": "M",
"comment": "the along ship steering angle of beam relative the transducer face in TACS coordinate system",
"comment": "The _z_-axis coordinate of a unit vector in the tx_beam direction for each beam and ping, as per the sonar beam coordinate system.",
"dims": [
"ping_timeDim",
"tx_beamDim"
......@@ -2236,42 +2151,20 @@
"attributes": [
{
"name": "long_name",
"value": "the along ship steering angle of beam relative the transducer face in TACS coordinate system"
"value": "_z_-component of the vector that gives the pointing direction of the tx_beam, in sonar beam coordinate system"
},
{
"name": "crs",
"value": "TACS"
"name": "units",
"value": "1"
},
{
"name": "valid_range",
"value": "-90.0f, 90.0f",
"value": "-1.0f, 1.0f",
"type": "float"
},
{
"name": "units",
"value": "arc_degree"
}
]
},
{
"name": "tx_transducer_zdepth",
"obligation": "O",
"comment": "Tx transducer depth in meters below waterline, at time of midpoint of first tx pulse. For the tx array (head) used by this RX-fan. Use depth of TX1 to move depth point (XYZ) from water line to transducer (reference point of old datagram format). ",
"dims": [
"ping_timeDim"
],
"type": "float",
"attributes": [
{
"name": "long_name",
"value": "Tx transducer depth below waterline"
},
{
"name": "units",
"value": "m"
}
]
},
{
"name": "beam_stabilisation",
"obligation": "M",
......@@ -2419,26 +2312,7 @@
{
"name": "sample_time_offset",
"obligation": "M",
"comment": "Time offset applied to sample time-stamps and intended for applying a range correction (e.g. as caused by signal processing delays). Positive values reduce the calculated range to a sample.",
"dims": [
"ping_timeDim"
],
"type": "float",
"attributes": [
{
"name": "long_name",
"value": "Time offset that is subtracted from the timestamp of each sample"
},
{
"name": "units",
"value": "s"
}
]
},
{
"name": "transmit_time_delay",
"obligation": "O",
"comment": "Time delay for each transmit beam between the ping time and the transmit time",
"comment": "Time offset applied to sample time-stamps and intended for applying a range correction (e.g. as caused by signal processing delays). Positive values reduce the calculated range to a sample. The range of a given sample at index sample_index and if a constant sound speed is applied is given by range= sound_speed_at_transducer*(blanking_interval+sample_index*sample_interval - sample_time_offset)/2",
"dims": [
"ping_timeDim",
"tx_beamDim"
......@@ -2447,7 +2321,7 @@
"attributes": [
{
"name": "long_name",
"value": "Time delay for each transmit beam between the ping time and the transmit time"
"value": "Time offset that is subtracted from the timestamp of each sample"
},
{
"name": "units",
......@@ -2458,7 +2332,7 @@
{
"name": "blanking_interval",
"obligation": "M",
"comment": "Time between first sample in data array and the first valid values.",
"comment": "Amount of time during reception where samples are discarded. The number of discarded sample is given by blanking_interval*sample_interval.",
"dims": [
"ping_timeDim",
"beamDim"
......@@ -2467,7 +2341,7 @@
"attributes": [
{
"name": "long_name",
"value": "Time between first recorded sample in data array and the first valid value "
"value": "Amount of time during reception where samples are discarded"
},
{
"name": "units",
......@@ -2787,7 +2661,7 @@
{
"name": "sound_speed_at_transducer",
"obligation": "O",
"comment": "Sound speed at tx transducer depth at ping time",
"comment": "Sound speed at transducer depth at the time of the ping",
"dims": [
"ping_timeDim"
],
......@@ -2974,20 +2848,6 @@
}
]
},
{
"name": "sector",
"comment": "The sector ids used by the vendor, can be different from the sector indexes. Used to have a matching between vendor ids and indexes",
"dims": [
"tx_beamDim"
],
"type": "int",
"attributes": [
{
"name": "long_name",
"value": "sector ids"
}
]
},
{
"name": "swath_dynamic_draught",
......@@ -3027,6 +2887,25 @@
}
]
},
{
"name": "tx_transducer_zdepth",
"obligation": "O",
"comment": "Tx transducer depth in meters below waterline, at time of midpoint of first tx pulse. For the tx array (head) used by this RX-fan. Use depth of TX1 to move depth point (XYZ) from water line to transducer (reference point of old datagram format). ",
"dims": [
"ping_timeDim"
],
"type": "float",
"attributes": [
{
"name": "long_name",
"value": "Tx transducer depth below waterline"
},
{
"name": "units",
"value": "m"
}
]
},
{
"name": "swath_time",
"obligation": "M",
......@@ -3059,26 +2938,6 @@
]
},
{
"name": "beam_detection_range",
"obligation": "0",
"comment": "approximation for the main bottom detection range in sample",
"dims": [
"ping_timeDim",
"beamDim"
],
"type": "int",
"attributes": [
{
"name": "long_name",
"value": "approximation of main bottom detection range in sample"
},
{
"name": "valid_min",
"value": "0"
}
]
},
{
"name": "beam_sector",
"obligation": "O",
......@@ -3157,6 +3016,26 @@
}
]
},
{
"name": "beam_detection_range",
"obligation": "0",
"comment": "approximation for the main bottom detection range in sample",
"dims": [
"ping_timeDim",
"beamDim"
],
"type": "int",
"attributes": [
{
"name": "long_name",
"value": "approximation of main bottom detection range in sample"
},
{
"name": "valid_min",
"value": "0"
}
]
},
{
"name": "detection_backscatter_calibration",
"obligation": "O",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment