decArgo_20210419_041a commit

euroargodev · Nov 24, 2022 · 12ef7a4 · 12ef7a4
1 parent d8a01d3
commit 12ef7a4
Show file tree

Hide file tree

Showing 407 changed files with 14,689 additions and 5,629 deletions.
diff --git a/decArgo_doc/decoder_user_manual/_CoriolisArgoFloatVersions_20210218.xlsx b/decArgo_doc/decoder_user_manual/_CoriolisArgoFloatVersions_20210218.xlsx
diff --git a/decArgo_doc/decoder_user_manual/_CoriolisArgoFloatVersions_20210418.xlsx b/decArgo_doc/decoder_user_manual/_CoriolisArgoFloatVersions_20210418.xlsx
diff --git a/decArgo_doc/decoder_versions/_argo_decoder_versions.xlsx b/decArgo_doc/decoder_versions/_argo_decoder_versions.xlsx
diff --git a/decArgo_soft/config/_configParamNames/_config_param_name_1015.csv b/decArgo_soft/config/_configParamNames/_config_param_name_1015.csv
@@ -22,8 +22,8 @@ CONFIG_DEBUG;n/a;Debugging Verbosity for generating engineering log entries;CONF
 CONFIG_DIR;n/a;Misc. configuration information;CONFIG_Direction_NUMBER;Ascending = 1, Descending = 2, Ascending and Descending = 3
 CONFIG_CT;n/a;Misc. configuration information;CONFIG_CycleTime_hours;For APEX and ARVOR floats this is the total duration of one cycle, usually 240 hours (10 days). For SOLO floats this is the total duration of one cycle, assuming that all float operations reach their full time-out intervals before moving to the next float stage. Typically the actual cycle time will be shorter than this value.
 CONFIG_DPF;n/a;Misc. configuration information;CONFIG_DeepProfileFirstFloat_LOGICAL;"Some APEX floats are set to do a ""profile on deployment"". This means that when the float is deployed it skips the drift phase at the PARKING depth and sinks directly to the PROFILE depth and starts ascending for the first profile. Independent of the Park and Profile cycle length, the first profile is always a Deep Profile that begins at the Profile Depth. This means the float returns a CTD profile relatively soon, typically less than a day, after the float is deployed. This feature supports comparison of the initial float profile with a conventional CTD cast from the ship. The result is that the first cycle is of shorter duration with a profile depth equal to PROFILE configuration pressure (regardless of the CONFIG_ParkAndProfileCycleCounter_COUNT configuration information). (Yes = 1, No = 0)."
-CONFIG_X01;n/a;Misc. configuration information;CONFIG_EcoBetaWavelength1_nm;Wavelength of <short sensor name> Beta  #<I> measurements (in nanometer).
-CONFIG_X02;n/a;Misc. configuration information;CONFIG_EcoBetaBandwidth_nm;Bandwidth of <short sensor name> Beta  #<I> measurements (in nanometer).
+CONFIG_X01;n/a;Misc. configuration information;CONFIG_EcoBetaWavelength1_nm;Wavelength of Eco Beta #1 measurements (in nanometer).
+CONFIG_X02;n/a;Misc. configuration information;CONFIG_EcoBetaBandwidth1_nm;Bandwidth of Eco Beta #1 measurements (in nanometer).
 CONFIG_X03;n/a;Misc. configuration information;CONFIG_EcoBetaAngle_angularDeg;Angle of Beta measurements  (in degrees) 
 CONFIG_X04;n/a;Misc. configuration information;CONFIG_EcoChlaFluorescenceExcitationWavelength_nm;Wavelength of <short sensor name> for excitation of <param> fluorescence measurements (in nanometer)
 CONFIG_X05;n/a;Misc. configuration information;CONFIG_EcoChlaFluorescenceEmissionWavelength_nm;Wavelength of <short sensor name> for emission of <param> fluorescence measurements (in nanometer)

diff --git a/decArgo_soft/config/_configParamNames/_config_param_name_1015.json b/decArgo_soft/config/_configParamNames/_config_param_name_1015.json
@@ -133,7 +133,7 @@
       "CONF_PARAM_LABEL" : "n/a",
       "CONF_PARAM_DEFINITION" : "Mission prelude period [hours]",
       "CONF_PARAM_NAME" : "CONFIG_MissionPreludeTime_hours",
-      "CONF_PARAM_DESCRIPTION" : "This is the duration the float transmits test messages for (from start up) before the first dive. It’s crucial in calculating the time of the first descent."
+      "CONF_PARAM_DESCRIPTION" : "This is the duration the float transmits test messages for (from start up) before the first dive. It’s crucial in calculating the time of the first descent."
    },
    "CONF_PARAM_18" :
    {
@@ -188,16 +188,16 @@
       "CONF_PARAM_DEC_ID" : "CONFIG_X01",
       "CONF_PARAM_LABEL" : "n/a",
       "CONF_PARAM_DEFINITION" : "Misc. configuration information",
-      "CONF_PARAM_NAME" : "CONFIG_EcoBetaWavelength_nm",
-      "CONF_PARAM_DESCRIPTION" : "Wavelength of <short sensor name> Beta  #<I> measurements (in nanometer)."
+      "CONF_PARAM_NAME" : "CONFIG_EcoBetaWavelength1_nm",
+      "CONF_PARAM_DESCRIPTION" : "Wavelength of Eco Beta #1 measurements (in nanometer)."
    },
    "CONF_PARAM_25" :
    {
       "CONF_PARAM_DEC_ID" : "CONFIG_X02",
       "CONF_PARAM_LABEL" : "n/a",
       "CONF_PARAM_DEFINITION" : "Misc. configuration information",
-      "CONF_PARAM_NAME" : "CONFIG_EcoBetaBandwidth_nm",
-      "CONF_PARAM_DESCRIPTION" : "Bandwidth of <short sensor name> Beta  #<I> measurements (in nanometer)."
+      "CONF_PARAM_NAME" : "CONFIG_EcoBetaBandwidth1_nm",
+      "CONF_PARAM_DESCRIPTION" : "Bandwidth of Eco Beta #1 measurements (in nanometer)."
    },
    "CONF_PARAM_26" :
    {

diff --git a/decArgo_soft/config/_configParamNames/_config_param_name_111.csv b/decArgo_soft/config/_configParamNames/_config_param_name_111.csv
@@ -37,7 +37,7 @@ CONF_PARAM_DEC_ID;CONF_PARAM_MSG_ID;CONF_PARAM_MSG_LABEL;CONF_PARAM_NAME;CONF_PA
 701;254;Number of days to force emergence;CONFIG_IceDetectionMaxDaysNoTransmission_NUMBER;Maximum delay (in days/cycles) of no transmission due to the ice detection algorithm. This parameter is used to disable the ice detection algorithmand force the float to surface even if ice is detected.
 702;254;Number of detection (ISA) to confirm ICE at surface;CONFIG_IceDetectionConsecutiveDetectionBeforeFloatSurfaceInhibition_NUMBER;Number of consecutive ISA detections before float surface inhibition.If fewer consecutive ice detections are made, then the float will immediately seek the surface if mixed layer temp is warm.
 703;254;Slowdown pressure threshold (float�s speed);CONFIG_AscentSpeedStartPressureThresholdForSlowPhase_dbar;Pressure threshold to start the slow ascent speed phase.
-704;254;Pressure acquisition period during ascent;CONFIG_IceDetectionPressureInterval_dbar;Period of the ice detection algorithm.
+704;254;Pressure acquisition period during ascent;CONFIG_IceDetectionPressureInterval_minutes;Period of the ice detection algorithm.
 705;254;Minimum ascent speed during �slow ascent�;CONFIG_IceDetectionAscentVerticalThresholdForBuoyancyAction_mm/s;Similar to CONFIG_AscentVerticalThresholdForBuoyancyAction_dbar but for a float in ice detection mode.
 706;254;Pump action duration;CONFIG_IceDetectionPumpActionMaxTimeAscent_csec;Similar to CONFIG_PumpActionMaxTimeAscent_csec but for a float in ice detection mode.
 707;254;GPS Timeout;CONFIG_GPSTimeout_minutes;Timeout for GPS acquisition.

diff --git a/decArgo_soft/config/_configParamNames/_config_param_name_111.json b/decArgo_soft/config/_configParamNames/_config_param_name_111.json
@@ -299,7 +299,7 @@
    {
       "CONF_PARAM_DEC_ID" : "703",
       "CONF_PARAM_MSG_ID" : "254",
-      "CONF_PARAM_MSG_LABEL" : "Slowdown pressure threshold (floats speed)",
+      "CONF_PARAM_MSG_LABEL" : "Slowdown pressure threshold (float’s speed)",
       "CONF_PARAM_NAME" : "CONFIG_AscentSpeedStartPressureThresholdForSlowPhase_dbar",
       "CONF_PARAM_DESCRIPTION" : "Pressure threshold to start the slow ascent speed phase."
    },
@@ -308,14 +308,14 @@
       "CONF_PARAM_DEC_ID" : "704",
       "CONF_PARAM_MSG_ID" : "254",
       "CONF_PARAM_MSG_LABEL" : "Pressure acquisition period during ascent",
-      "CONF_PARAM_NAME" : "CONFIG_IceDetectionPressureInterval_dbar",
+      "CONF_PARAM_NAME" : "CONFIG_IceDetectionPressureInterval_minutes",
       "CONF_PARAM_DESCRIPTION" : "Period of the ice detection algorithm."
    },
    "CONF_PARAM_40" :
    {
       "CONF_PARAM_DEC_ID" : "705",
       "CONF_PARAM_MSG_ID" : "254",
-      "CONF_PARAM_MSG_LABEL" : "Minimum ascent speed during slow ascent",
+      "CONF_PARAM_MSG_LABEL" : "Minimum ascent speed during “slow ascent”",
       "CONF_PARAM_NAME" : "CONFIG_IceDetectionAscentVerticalThresholdForBuoyancyAction_mm/s",
       "CONF_PARAM_DESCRIPTION" : "Similar to CONFIG_AscentVerticalThresholdForBuoyancyAction_dbar but for a float in ice detection mode."
    },
@@ -443,23 +443,23 @@
    {
       "CONF_PARAM_DEC_ID" : "404",
       "CONF_PARAM_MSG_ID" : "255",
-      "CONF_PARAM_MSG_LABEL" : "End Day for Cycle Period 1",
+      "CONF_PARAM_MSG_LABEL" : "End Day for “Cycle Period” 1",
       "CONF_PARAM_NAME" : "CONFIG_InternalCycle<D>LastGregDay_DD",
       "CONF_PARAM_DESCRIPTION" : "Last day to use float cycle duration #<D> (in gregorian day). (D is a number denoting the internal cycle label)"
    },
    "CONF_PARAM_57" :
    {
       "CONF_PARAM_DEC_ID" : "405",
       "CONF_PARAM_MSG_ID" : "255",
-      "CONF_PARAM_MSG_LABEL" : "End Month for Cycle Period 1",
+      "CONF_PARAM_MSG_LABEL" : "End Month for “Cycle Period” 1",
       "CONF_PARAM_NAME" : "CONFIG_InternalCycle<D>LastGregMonth_MM",
       "CONF_PARAM_DESCRIPTION" : "Last month to use float cycle duration #<D> (in gregorian month). (D is a number denoting the internal cycle label)"
    },
    "CONF_PARAM_58" :
    {
       "CONF_PARAM_DEC_ID" : "406",
       "CONF_PARAM_MSG_ID" : "255",
-      "CONF_PARAM_MSG_LABEL" : "End Year for Cycle Period 1",
+      "CONF_PARAM_MSG_LABEL" : "End Year for “Cycle Period” 1",
       "CONF_PARAM_NAME" : "CONFIG_InternalCycle<D>LastGregYear_YYYY",
       "CONF_PARAM_DESCRIPTION" : "Last year to use float cycle duration #<D> (in gregorian year, two digits). (D is a number denoting the internal cycle label)"
    },
@@ -476,39 +476,39 @@
       "CONF_PARAM_DEC_ID" : "500",
       "CONF_PARAM_MSG_ID" : "251",
       "CONF_PARAM_MSG_LABEL" : "Sampling period for X in descent to parking depth (in zone #Z) (in seconds)",
-      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DepthZone<N>DescentToParkPresSamplingPeriod_seconds",
+      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DescentToParkPhaseDepthZone<N>SamplingPeriod_seconds",
       "CONF_PARAM_DESCRIPTION" : "Sampling period of the <short sensor name> during the descent to parking pressure in the depth zone #<N> (in seconds)."
    },
    "CONF_PARAM_61" :
    {
       "CONF_PARAM_DEC_ID" : "501",
       "CONF_PARAM_MSG_ID" : "251",
       "CONF_PARAM_MSG_LABEL" : "Sampling period for X in parking drift (in zone #Z) (in minutes)",
-      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DepthZone<N>DriftAtParkPresSamplingPeriod_minutes",
+      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>ParkDriftPhaseDepthZone<N>SamplingPeriod_seconds",
       "CONF_PARAM_DESCRIPTION" : "Sampling period of the <short sensor name> during the drift at parking pressure in the depth zone #<N> (in minutes)."
    },
    "CONF_PARAM_62" :
    {
       "CONF_PARAM_DEC_ID" : "502",
       "CONF_PARAM_MSG_ID" : "251",
       "CONF_PARAM_MSG_LABEL" : "Sampling period for X in descent to profile depth (in zone #Z) (in seconds)",
-      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DepthZone<N>DescentToProfilePresSamplingPeriod_seconds",
+      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DescentToProfPhaseDepthZone<N>SamplingPeriod_seconds",
       "CONF_PARAM_DESCRIPTION" : "Sampling period of the <short sensor name> during the descent to profile pressure in the depth zone #<N> (in seconds)."
    },
    "CONF_PARAM_63" :
    {
       "CONF_PARAM_DEC_ID" : "503",
       "CONF_PARAM_MSG_ID" : "251",
       "CONF_PARAM_MSG_LABEL" : "Sampling period for X in profile depth drift (in zone #Z) (in minutes)",
-      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DepthZone<N>DriftAtProfilePresSamplingPeriod_minutes",
+      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>ProfDriftPhaseDepthZone<N>SamplingPeriod_seconds",
       "CONF_PARAM_DESCRIPTION" : "Sampling period of the <short sensor name> during the drift at profile pressure in the depth zone #<N> (in minutes)."
    },
    "CONF_PARAM_64" :
    {
       "CONF_PARAM_DEC_ID" : "504",
       "CONF_PARAM_MSG_ID" : "251",
       "CONF_PARAM_MSG_LABEL" : "Sampling period for X in ascent profile (in zone #Z) (in seconds)",
-      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>DepthZone<N>AscentSamplingPeriod_seconds",
+      "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>AscentPhaseDepthZone<N>SamplingPeriod_seconds",
       "CONF_PARAM_DESCRIPTION" : "Sampling period of the <short sensor name> during the ascending profile in the depth zone #<N> (in seconds)."
    },
    "CONF_PARAM_65" :
@@ -563,7 +563,7 @@
    {
       "CONF_PARAM_DEC_ID" : "602",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "1st «valid sample» rank of CTD",
+      "CONF_PARAM_MSG_LABEL" : "1st «valid sample» rank of CTD",
       "CONF_PARAM_NAME" : "CONFIG_<short_sensor_name>FirstValidSample_NUMBER",
       "CONF_PARAM_DESCRIPTION" : "Rank of the first valid sample provided by the <short sensor name> (0 is the rank of the first sample)."
    },
@@ -595,15 +595,15 @@
    {
       "CONF_PARAM_DEC_ID" : "607",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "Min temperature of CTD (m°C)",
+      "CONF_PARAM_MSG_LABEL" : "Min temperature of CTD (m°C)",
       "CONF_PARAM_NAME" : "CONFIG_CtdMinTransmittedTemperature_mdegC",
       "CONF_PARAM_DESCRIPTION" : "Minimum value of transmitted Ctd temperature measurements (in milli-DegC)."
    },
    "CONF_PARAM_76" :
    {
       "CONF_PARAM_DEC_ID" : "608",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "Max temperature of CTD (m°C)",
+      "CONF_PARAM_MSG_LABEL" : "Max temperature of CTD (m°C)",
       "CONF_PARAM_NAME" : "CONFIG_CtdMaxTransmittedTemperature_mdegC",
       "CONF_PARAM_DESCRIPTION" : "Maximum value of transmitted Ctd temperature measurements (in milli-DegC)."
    },
@@ -659,7 +659,7 @@
    {
       "CONF_PARAM_DEC_ID" : "617",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "Median temperature (m°C)",
+      "CONF_PARAM_MSG_LABEL" : "Median temperature (m°C)",
       "CONF_PARAM_NAME" : "CONFIG_IceDetection_degC",
       "CONF_PARAM_DESCRIPTION" : "Ice temperature in [degree Celsius/1e3] where profiles are aborted because of ice formation conditions"
    },
@@ -715,15 +715,15 @@
    {
       "CONF_PARAM_DEC_ID" : "628",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "Min T° of OPTODE (m°C)",
+      "CONF_PARAM_MSG_LABEL" : "Min T° of OPTODE (m°C)",
       "CONF_PARAM_NAME" : "CONFIG_OptodeMinTransmittedTemperature_mdegC",
       "CONF_PARAM_DESCRIPTION" : "Minimum value of transmitted Optode temperature measurements (in milli-DegC)."
    },
    "CONF_PARAM_91" :
    {
       "CONF_PARAM_DEC_ID" : "629",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "Max T° of OPTODE (m°C)",
+      "CONF_PARAM_MSG_LABEL" : "Max T° of OPTODE (m°C)",
       "CONF_PARAM_NAME" : "CONFIG_OptodeMaxTransmittedTemperature_mdegC",
       "CONF_PARAM_DESCRIPTION" : "Maximum value of transmitted Optode temperature measurements (in milli-DegC)."
    },
@@ -875,7 +875,7 @@
    {
       "CONF_PARAM_DEC_ID" : "680",
       "CONF_PARAM_MSG_ID" : "251",
-      "CONF_PARAM_MSG_LABEL" : "« APF Frame » transmission of SUNA (nitrate concentration = 0, spectrum APF frame = 1)",
+      "CONF_PARAM_MSG_LABEL" : "« APF Frame » transmission of SUNA (nitrate concentration = 0, spectrum APF frame = 1)",
       "CONF_PARAM_NAME" : "CONFIG_SunaDataType_NUMBER",
       "CONF_PARAM_DESCRIPTION" : "Type of transmitted data from te Suna sensor (0 : nitrate concentration, 1 : APF frame spectrum)."
    },

diff --git a/decArgo_soft/config/_configParamNames/_config_param_name_1122.csv b/decArgo_soft/config/_configParamNames/_config_param_name_1122.csv
@@ -65,6 +65,8 @@ CONFIG_PROFILE05;n/a;n/a;CONFIG_<short_sensor_name>CpAscentPhaseDepthZone<N>Samp
 CONFIG_PROFILE06;n/a;n/a;CONFIG_<short_sensor_name>CpAscentPhaseDepthZone<N>SamplingPeriod_seconds;Sampling period for the ascent depth zone  #<N> of the <short_sensor_name> sensor used in continuous profiling mode.
 CONFIG_MEASURE01;n/a;n/a;CONFIG_<short_sensor_name>InAirMeasurementNumberOfSamples_NUMBER;"Number of measurements sampled before and after inflating the air bladder for the <short_sensor_name> sensor during the ""in air measurement"" phase."
 CONFIG_MEASURE02;n/a;n/a;CONFIG_<short_sensor_name>InAirMeasurementSamplingPeriod_seconds;"Sampling period for the <short_sensor_name> sensor during the ""in air measurement"" phase."
+CONFIG_POWER_START;n/a;n/a;CONFIG_<short_sensor_name><cycle_phase_name>PowerOnStartPres_dbar;Start pressure to power on the <short_sensor_name> sensor.
+CONFIG_POWER_STOP;n/a;n/a;CONFIG_<short_sensor_name><cycle_phase_name>PowerOnStopPres_dbar;Stop pressure to power on the <short_sensor_name> sensor.
       CONFIG_PX_1_6_0_0_3;n/a;n/a;CONFIG_SunaApfFrameOutputPixelBegin_NUMBER;The Apf frame definition allows for a variable number of spectrometer pixels (also called channels) to be included in the frame. The two pixel values are configured indirectly via the wavelength range of the spectrum to be output (Suna Hardware Manual, section 4.2.3, input/output configuration parameters, data wavelength low/high.) The firmware converts the wavelength values to spectrometer pixels.
       CONFIG_PX_1_6_0_0_4;n/a;n/a;CONFIG_SunaApfFrameOutputPixelEnd_NUMBER;The Apf frame definition allows for a variable number of spectrometer pixels (also called channels) to be included in the frame. The two pixel values are configured indirectly via the wavelength range of the spectrum to be output (Suna Hardware Manual, section 4.2.3, input/output configuration parameters, data wavelength low/high.) The firmware converts the wavelength values to spectrometer pixels.
       CONFIG_PX_1_5_0_0_1;n/a;n/a;CONFIG_CroverInPumpedStream_LOGICAL;Bio Argo sensors can either be mounted separately to the Ctd or mounted within the Ctd pumped stream. Values: Yes = 1, No = 0