Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
},
{
"column": "peak of interest mean dia (nm)",
"alt_columns": ["pkoi intensity mean dia. (nm)"],
"name": "Peak of Interest Mean Diameter",
"feature": "dynamic light scattering",
"unit": "nm",
Expand All @@ -140,18 +141,21 @@
},
{
"column": "peak of interest est. mw (kda)",
"alt_columns": ["pkoi est. mw (kda)"],
"name": "Peak of Interest Est. MW",
"feature": "dynamic light scattering",
"unit": "kDa",
},
{
"column": "peak of interest intensity (%)",
"alt_columns": ["pkoi intensity area (%)"],
"name": "Peak of Interest Intensity",
"feature": "dynamic light scattering",
"unit": "%",
},
{
"column": "peak of interest mass (%)",
"alt_columns": ["pkoi mass area (%)"],
"name": "Peak of Interest Mass",
"feature": "dynamic light scattering",
"unit": "%",
Expand All @@ -162,6 +166,20 @@
"feature": "dynamic light scattering",
"unit": UNITLESS,
},
{
"column": "peak of interest mass mean dia (nm)",
"alt_columns": ["pkoi mass mean dia. (nm)"],
"name": "Peak of Interest Mass Mean Diameter",
"feature": "dynamic light scattering",
"unit": "nm",
},
{
"column": "peak of interest rayleigh ratio r (cm^-1)",
"alt_columns": ["pkoi rayleigh ratio r (1/km)"],
"name": "Peak of Interest Rayleigh Ratio R",
"feature": "dynamic light scattering",
"unit": UNITLESS,
},
{
"column": "derived intensity (cps)",
"name": "Derived intensity",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,20 @@ def create_calculated_data(
view_data=detection_type_view,
source_configs=(dynamic_light_scattering_conf,),
),
CalculatedDataConfig(
name="Peak of Interest Mass Mean Diameter",
value="peak of interest mass mean dia (nm)",
unit="nm",
view_data=detection_type_view,
source_configs=(dynamic_light_scattering_conf,),
),
CalculatedDataConfig(
name="Peak of Interest Rayleigh Ratio R",
value="peak of interest rayleigh ratio r (cm^-1)",
unit=UNITLESS,
view_data=detection_type_view,
source_configs=(dynamic_light_scattering_conf,),
),
CalculatedDataConfig(
name="Derived intensity (cps)",
value="derived intensity (cps)",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,6 @@ def _extract_peak_data(well_plate_data: SeriesData) -> list[dict[str, Any]]:
if peak_info := _extract_peak_info(well_plate_data, prefix, str(peak_num)):
peak_data.append(peak_info)

# Read "peak of interest" / "pkoi" columns to prevent them from leaking
# into custom_info, but don't add as a separate peak entry since it
# duplicates one of the numbered peaks.
poi_prefix = "pkoi" if uses_new_format else "peak of interest"
_extract_peak_info(well_plate_data, poi_prefix, "OI")

return peak_data


Expand Down
Loading
Loading