Skip to content

Commit

Permalink
Merge pull request #8 from NEONScience/NC_updates
Browse files Browse the repository at this point in the history
Nc updates
  • Loading branch information
ncatolico authored Apr 8, 2024
2 parents 98b299e + a16b36a commit 9d5de94
Show file tree
Hide file tree
Showing 18 changed files with 772 additions and 18 deletions.
11 changes: 7 additions & 4 deletions avro_schemas/aquatroll200/aquatroll200_calibrated.avsc
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,10 @@
},
{
"name": "site_id",
"type": "string",
"type": [
"null",
"string"
],
"doc": "NEON site identifier"
},
{
Expand All @@ -34,7 +37,7 @@
"float"
],
"default": null,
"doc": "Calibrated pressure of groundwater",
"doc": "Calibrated pressure of water",
"__neon_units": "kilopascal",
"__neon_stream_id": "0"
},
Expand All @@ -55,7 +58,7 @@
"float"
],
"default": null,
"doc": "Calibrated temperature in groundwater",
"doc": "Calibrated temperature in water",
"__neon_units": "celsius",
"__neon_stream_id": "2"
},
Expand All @@ -76,7 +79,7 @@
"float"
],
"default": null,
"doc": "Calibrated specific conductance in groundwater",
"doc": "Calibrated specific conductance in water",
"__neon_units": "microsiemensPerCentimeter",
"__neon_stream_id": "4"
},
Expand Down
13 changes: 8 additions & 5 deletions avro_schemas/aquatroll200/aquatroll200_cond_corrected.avsc
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@
"fields": [
{
"name": "source_id",
"type": "string",
"type": [
"null",
"string"
],
"doc": "Source serial number or MAC address"
},
{
Expand All @@ -34,7 +37,7 @@
"float"
],
"default": null,
"doc": "Calibrated pressure of groundwater",
"doc": "Calibrated pressure of water",
"__neon_units": "kilopascal",
"__neon_stream_id": "0"
},
Expand All @@ -55,7 +58,7 @@
"float"
],
"default": null,
"doc": "Calibrated temperature in groundwater",
"doc": "Calibrated temperature in water",
"__neon_units": "celsius",
"__neon_stream_id": "2"
},
Expand All @@ -76,7 +79,7 @@
"float"
],
"default": null,
"doc": "Calibrated raw conductivity in groundwater",
"doc": "Calibrated raw conductivity in water",
"__neon_units": "microsiemensPerCentimeter",
"__neon_stream_id": "4"
},
Expand All @@ -97,7 +100,7 @@
"float"
],
"default": null,
"doc": "Calibrated specific conductance in groundwater",
"doc": "Calibrated specific conductance in water",
"__neon_units": "microsiemensPerCentimeter"
},
{
Expand Down
108 changes: 108 additions & 0 deletions avro_schemas/aquatroll200/aquatroll200_log_data.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"type": "record",
"name": "aquatroll200_log_data",
"namespace": "org.neonscience.schema.dp0p",
"doc": "Log data for the Aqua Troll 520 sensor",
"__version": "1.0",
"__neon_parts": [
"0317730000"
],
"fields": [
{
"name": "source_id",
"type": "string",
"doc": "Source serial number or MAC address"
},
{
"name": "site_id",
"type": [
"null",
"string"
],
"doc": "NEON site identifier"
},
{
"name": "readout_time",
"type": {
"type": "long",
"logicalType": "timestamp-millis"
},
"doc": "Timestamp of readout expressed in milliseconds since epoch",
"__neon_units": "millisecond"
},
{
"name": "pressure",
"type": [
"null",
"float"
],
"default": null,
"doc": "Raw pressure of water",
"__neon_units": "psi",
"__neon_stream_id": "0"
},
{
"name": "pressure_data_quality",
"type": [
"null",
"uint16"
],
"default": null,
"doc": "Data quality id from sensor for pressure represented by a 16 bit unsigned integer",
"__neon_stream_id": "1"
},
{
"name": "temperature",
"type": [
"null",
"float"
],
"default": null,
"doc": "Raw temperature in water",
"__neon_units": "celsius",
"__neon_stream_id": "2"
},
{
"name": "temperature_data_quality",
"type": [
"null",
"uint16"
],
"default": null,
"doc": "Data quality code from sensor for temperature represented by a 16 bit unsigned integer",
"__neon_stream_id": "3"
},
{
"name": "conductivity",
"type": [
"null",
"float"
],
"default": null,
"doc": "Raw specific conductance in water",
"__neon_units": "microsiemensPerCentimeter",
"__neon_stream_id": "4"
},
{
"name": "conductivity_data_quality",
"type": [
"null",
"uint16"
],
"default": null,
"doc": "Data quality code from sensor for conductivity represented by a 16 bit unsigned integer",
"__neon_stream_id": "5"
},
{
"name": "internal_battery",
"type": [
"null",
"uint16"
],
"default": null,
"doc": "Internal battery voltage in millivolts represented by a 16 bit unsigned integer",
"__neon_units": "millivolt",
"__neon_stream_id": "6"
}
]
}
61 changes: 61 additions & 0 deletions avro_schemas/aquatroll200/aquatroll200_log_flags.avsc
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"type": "record",
"name": "aquatroll200_log_flags",
"namespace": "org.neonscience.schema.dp0p",
"doc": "Log data flags for the Aqua Troll 200 sensor",
"__version": "1.0",
"__neon_parts": [
"0317730000"
],
"fields": [
{
"name": "readout_time",
"type": {
"type": "long",
"logicalType": "timestamp-millis"
},
"doc": "Timestamp of readout expressed in milliseconds since epoch",
"__neon_units": "millisecond"
},
{
"name": "pressureLogDataQF",
"type": [
"null",
"int8"
],
"default": null,
"doc": "Quality flag for the pressure log data (1=fail, 0=pass, -1=NA (i.e., could not be run))",
"__neon_units": "NA"
},
{
"name": "logDataDateQF",
"type": [
"null",
"int8"
],
"default": null,
"doc": "Quality flag for edited log data readout time (1=fail, 0=pass, -1=NA (i.e., could not be run))",
"__neon_units": "NA"
},
{
"name": "temperatureLogDataQF",
"type": [
"null",
"int8"
],
"default": null,
"doc": "Quality flag for the temperature log data (1=fail, 0=pass, -1=NA (i.e., could not be run))",
"__neon_units": "NA"
},
{
"name": "conductivityLogDataQF",
"type": [
"null",
"int8"
],
"default": null,
"doc": "Quality flag for the conductivity log data (1=fail, 0=pass, -1=NA (i.e., could not be run))",
"__neon_units": "NA"
}
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -770,6 +770,126 @@
"doc": "Quality metric that summarizes when the missing temperature test could not be run over the averaging period, as a percent",
"__neon_units": "percent"
},
{
"name": "gWatElevLogDataPassQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the passed outcomes of the pressure log data gap filling test over the averaging period, as a percent (100=No log data were used for gap filling)",
"__neon_units": "percent"
},
{
"name": "gWatElevLogDataFailQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the failed outcomes of the pressure log data gap filling test over the averaging period, as a percent (100=log data were used for gap filling 100 percent of the data points)",
"__neon_units": "percent"
},
{
"name": "gWatElevLogDataNAQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric for when the pressure log data summary could not be run over the averaging period, as a percent",
"__neon_units": "percent"
},
{
"name": "logDataDatePassQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the passed outcomes of the edited log data readout time test over the averaging period, as a percent",
"__neon_units": "percent"
},
{
"name": "logDataDateFailQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the failed outcomes of the edited log data readout time test over the averaging period, as a percent",
"__neon_units": "percent"
},
{
"name": "logDataDateNAQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric for when the edited log data readout time test could not be run, as a percent",
"__neon_units": "percent"
},
{
"name": "gWatTempLogDataPassQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the passed outcomes of the temperature log data gap filling test over the averaging period, as a percent (100=No log data were used for gap filling)",
"__neon_units": "percent"
},
{
"name": "gWatTempLogDataFailQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the failed outcomes of the temperature log data gap filling test over the averaging period, as a percent (100=log data were used for gap filling 100 percent of the data points)",
"__neon_units": "percent"
},
{
"name": "gWatTempLogDataNAQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric for when the temperature log data summary could not be run over the averaging period, as a percent",
"__neon_units": "percent"
},
{
"name": "gWatSCondLogDataPassQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the passed outcomes of the specific conductivity log data gap filling test over the averaging period, as a percent (100=No log data were used for gap filling)",
"__neon_units": "percent"
},
{
"name": "gWatSCondLogDataFailQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric that summarizes the failed outcomes of the specific conductivity log data gap filling test over the averaging period, as a percent (100=log data were used for gap filling 100 percent of the data points)",
"__neon_units": "percent"
},
{
"name": "gWatSCondLogDataNAQM",
"type": [
"null",
"float"
],
"default": null,
"doc": "Quality metric for when the specific conductivity log data summary could not be run over the averaging period, as a percent",
"__neon_units": "percent"
},
{
"name": "zeroPressurePassQM",
"type": [
Expand Down
Loading

0 comments on commit 9d5de94

Please sign in to comment.