Merge pull request #139 from SamuelDahlberg/master

Issue #15739: Various prtsz and turbd preload fixes.

csv/ParameterDefs.csv

@@ -3642,20 +3642,20 @@ TO-DO,METBK,raw_temperature,raw_temperature,PD8119,quantity,,int32,,counts,-9999
 TO-DO,METBK,raw_conductivity,raw_conductivity,PD8120,quantity,,int32,,counts,-9999999,Unprocessed (L0) Sea Surface Conductivity,0,,,,,,CONDSRF_L0,"Unprocessed sea surface conductivity data that are output directly from the sensor. Sea surface conductivity refers to the ability of seawater to conduct electricity. The presence of ions in the seawater, such as salt, increases the electrical conducting ability of seawater. As such, conductivity can be used as a proxy for determining the quantity of salt in a sample of seawater.",Unprocessed (L0) Sea Surface Electrical Conductivity Measurement,Unprocessed Data,L0
 TO-DO,METBK,sea_surface_temperature,sea_surface_temperature,PD8121,function,,float32,,degrees_Celsius,-9999999,Sea Surface Temperature,3,,PFID206,"{""t0"":""PD8119"",""a0"":""CC_a0"",""a1"":""CC_a1"",""a2"":""CC_a2"",""a3"":""CC_a3""}",TEMPSRF,sea_surface_temperature,TEMPSRF_L1,Sea Surface Temperature is the temperature of the seawater near the ocean surface.,Sea Surface Temperature,Science Data,L1
 TO-DO,METBK,sea_surface_conductivity,sea_surface_conductivity,PD8122,function,,float32,,S m-1,-9999999,Sea Surface Conductivity,4,,PFID207,"{""c0"":""PD8120"",""t1"":""PD8121"",""p1"":""CC_depth"",""g"":""CC_g"",""h"":""CC_h"",""i"":""CC_i"",""j"":""CC_j"",""cpcor"":""CC_cpcor"",""ctcor"":""CC_ctcor"", ""wbotc"":""CC_wbotc""}",CONDSRF,sea_surface_conductivity,CONDSRF_L1,Sea Surface Conductivity is the conductivity of the seawater near the ocean surface.,Sea Surface Conductivity,Science Data,L1
-,,volume_concentration,volume_concentration,PD8123,array<quantity>,"[""bin""]",float32,,uL,-9999999,Volume Concentration,4,,,,,,,"Array of volume concentration for particles analyzed by instrument, binned by particle size.",Volume Concentration,Science Data,L1
-,,laser_transmission_sensor,laser_transmission_sensor,PD8124,quantity,,float32,,mW,-9999999,Laser Transmission Sensor,4,,,,,,,The intensity of the laser reference sensor.,Laser Transmission Sensor,Science Data,L0
-,,supply_voltage,supply_voltage,PD8125,quantity,,float32,,V,-9999999,Supply Voltage,2,,,,,,,Voltage being supplied to the instrument.,Supply Voltage,Science Data,L0
-,,laser_reference_sensor,laser_reference_sensor,PD8126,quantity,,float32,,mW,-9999999,Laser Reference Sensor,4,,,,,,,The intensity of the laser reference sensor. Used to correct scattering calculations for variations in beam output intensity.,Laser Reference Sensor,Science Data,L0
-,,depth,depth,PD8127,quantity,,float32,,m,-9999999,Depth,2,,,,,depth,,The vertical distance below the surface.,Depth,Science Data,L0
-,,mean_diameter,mean_diameter,PD8128,quantity,,float32,,um,-9999999,Mean Diameter,2,,,,,,,The mean diameter of analyzed particles.,Mean Diameter,Science Data,L1
-,,total_volume_concentration,total_volume_concentration,PD8129,quantity,,float32,,ppm,-9999999,Total Volume Concentration,4,,,,,,,The total volume concentration of particles.,Total Volume Concentration,Science Data,L1
-,,relative_humidity,relative_humidity,PD8130,quantity,,uint8,,percent,0,Relative Humidity,0,,,,,relative_humidity,,Percent relative humidity internal to the sensor.,Relative Humidity,Science Data,L0
-,,ambient_light,ambient_light,PD8131,quantity,,int32,,count,-9999999,Ambient Light,0,,,,,,,Measure of light not produced by instrument laser.,Ambient Light,Science Data,L0
-,,computed_optical_transmission,computed_optical_transmission,PD8132,quantity,,float32,,1,-9999999,Computed Optical Transmission,3,,,,,,,Measure of what proportion of light is transmitted through a turbid medium.,Computed Optical Transmission,Science Data,L0
-,,beam_attenuation,beam_attenuation,PD8133,quantity,,float32,,m-1,-9999999,Beam Attenuation,3,,,,,volume_beam_attenuation_coefficient_of_radiative_flux_in_sea_water,,The rate that the intensity of a beam of light will decrease in response to the combined effects of absorption and scatter as a function of propagation distance.,Volume Beam Attenuation Coefficient Of Radiative Flux In Sea Water,Science Data,L1
-,,max_particle_size,max_particle_size,PD8134,quantity,,uint16,,um,0,Max Particle Size,0,,,,,,,The upper size limit of a particle that will be binned into volume concentration.,Max Particle Size,Science Data,L0
-,,particle_lower_size_bins,particle_lower_size_bins,PD8135,array<quantity>,"[""bin""]",float32,,um,-9999999,Lower Particle Size of Bins,2,,,,,,,The lower particle size limit for each bin of volume concentration.,Lower Particle Size of Bins,Science Data,L0
-,,turbidity,turbidity,PD8136,function,,float32,,ntu,-9999999,Turbidity,4,,PFID74,"{""sf"":""CC_scale_factor_turbd"",""X"":""PD1139"",""off"":""CC_dark_counts_turbd""}",,sea_water_turbidity,,"Turbidity expressed in NTU (Nephelometric Turbidity Units) is the proportion of white light scattered back to a transceiver by the particulate load in a body of water, represented on an arbitrary scale referenced against measurements made in the laboratory on aqueous suspensions of formazine beads.",Sea Water Turbidity,Science Data,L2
+,,volume_concentration,volume_concentration,PD8123,array<quantity>,"[""bin""]",float32,,uL L-1,-9999999,Volume Concentration,4,,,,,,VOLCONC_L1,"Array of volume concentration for particles analyzed by instrument, binned by particle size.",Volume Concentration,Science Data,L1
+,,laser_transmission_sensor,laser_transmission_sensor,PD8124,quantity,,float32,,mW,-9999999,Laser Transmission Sensor,4,,,,,,,The intensity of the laser reference sensor.,Laser Transmission Sensor,Unprocessed Data,L0
+,,supply_voltage,supply_voltage,PD8125,quantity,,float32,,V,-9999999,Supply Voltage,2,,,,,,,Voltage being supplied to the instrument.,Supply Voltage,Unprocessed Data,L0
+,,laser_reference_sensor,laser_reference_sensor,PD8126,quantity,,float32,,mW,-9999999,Laser Reference Sensor,4,,,,,,,The intensity of the laser reference sensor. Used to correct scattering calculations for variations in beam output intensity.,Laser Reference Sensor,Unprocessed Data,L0
+,,depth,depth,PD8127,quantity,,float32,,m,-9999999,Depth,2,,,,,depth,,The vertical distance below the surface.,Depth,Unprocessed Data,L0
+,,mean_diameter,mean_diameter,PD8128,quantity,,float32,,um,-9999999,Mean Diameter,2,,,,,,DIAMEAN_L1,The mean diameter of analyzed particles.,Mean Diameter,Science Data,L1
+,,total_volume_concentration,total_volume_concentration,PD8129,quantity,,float32,,ppm,-9999999,Total Volume Concentration,4,,,,,,TVOLCON_L1,The total volume concentration of particles.,Total Volume Concentration,Science Data,L1
+,,relative_humidity,relative_humidity,PD8130,quantity,,uint8,,percent,0,Relative Humidity,0,,,,,relative_humidity,,Percent relative humidity internal to the sensor.,Relative Humidity,Unprocessed Data,L0
+,,ambient_light,ambient_light,PD8131,quantity,,int32,,count,-9999999,Ambient Light,0,,,,,,,Measure of light not produced by instrument laser.,Ambient Light,Unprocessed Data,L0
+,,computed_optical_transmission,computed_optical_transmission,PD8132,quantity,,float32,,1,-9999999,Computed Optical Transmission,3,,,,,,,Measure of what proportion of light is transmitted through a turbid medium.,Computed Optical Transmission,Unprocessed Data,L0
+,,beam_attenuation,beam_attenuation,PD8133,quantity,,float32,,m-1,-9999999,Beam Attenuation,3,,,,,volume_beam_attenuation_coefficient_of_radiative_flux_in_sea_water,PRTATTN_L1,The rate that the intensity of a beam of light will decrease in response to the combined effects of absorption and scatter as a function of propagation distance.,Volume Beam Attenuation Coefficient Of Radiative Flux In Sea Water,Science Data,L1
+,,max_particle_size,max_particle_size,PD8134,quantity,,uint16,,um,0,Max Particle Size,0,,,,,,,The upper size limit of a particle that will be binned into volume concentration.,Max Particle Size,Unprocessed Data,L0
+,,particle_lower_size_bins,particle_lower_size_bins,PD8135,array<quantity>,"[""bin""]",float32,,um,-9999999,Lower Particle Size of Bins,2,,,,,,,The lower particle size limit for each bin of volume concentration.,Lower Particle Size of Bins,Unprocessed Data,L0
+,,turbidity,turbidity,PD8136,function,,float32,,ntu,-9999999,Turbidity,4,,PFID74,"{""sf"":""CC_scale_factor_turbd"",""X"":""PD1139"",""off"":""CC_dark_counts_turbd""}",,sea_water_turbidity,TURBDTY_L1,"Turbidity expressed in NTU (Nephelometric Turbidity Units) is the proportion of white light scattered back to a transceiver by the particulate load in a body of water, represented on an arbitrary scale referenced against measurements made in the laboratory on aqueous suspensions of formazine beads.",Sea Water Turbidity,Science Data,L2
 ,,sample_number,sample_number,PD8137,quantity,,int32,,1,-9999999,Sample Number,,,,,,,,Sample number since beginning of IFCB deployment,Sample Number of current IFCB deployment,Engineering Data,L0
 ,,sample_type,sample_type,PD8138,quantity,,string,,1,empty,Sample Type,,,,,,,,"Type of sample being run: Normal, beads",Sample type,Engineering Data,L0
 ,,trigger_count,trigger_count,PD8139,quantity,,int32,,counts,-9999999,Trigger Count,,,,,,,,Number of qualifying images detected in sample,Trigger count,Engineering Data,L0