apmtools 0.2.47__tar.gz → 0.2.49__tar.gz

{apmtools-0.2.47 → apmtools-0.2.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.47
+Version: 0.2.49
 Summary: A collection of tools for processing air pollution monitoring data
 Project-URL: Homepage, https://github.com/federlorenz/apmtools
 Author-email: Federico Lorenzetti <lorenzetti.federico@gmail.com>

{apmtools-0.2.47 → apmtools-0.2.49}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "apmtools"
-version = "0.2.47"
+version = "0.2.49"
 authors = [
   { name="Federico Lorenzetti", email="lorenzetti.federico@gmail.com" },
 ]

{apmtools-0.2.47 → apmtools-0.2.49}/src/apmtools/classes.py

@@ -574,7 +574,7 @@ class Dataset(DictionaryPlus):
                     self.scan_folder(directory=f"{directory}{j}/", levels=levels,
                                      level=level+1, monitor=monitor, levels_dict=levels_dict, utc_timezone_shift=utc_timezone_shift, interpolate=interpolate, add_m=add_m)
 
-    def save_summary(self, save_csv=True, filename="./", columns={}, merged=True):
+    def save_summary(self, save_csv=True, filename="./", all_variables=False, merged=True):
         types_in = list(set(type(v) for v in self.values()))
 
         def match_class(x):
@@ -619,13 +619,9 @@ class Dataset(DictionaryPlus):
                         "start", "end", "length", "datetime","timedelta"]
             columns2 = list(set(d.meta()).difference(
                 set(["filter", "header", "parameters"])))
-            if "upas" not in columns.keys():
-                columns3 = ["pm25"]
-            else:
-                columns3 = ["pm25"]+columns["upas"] if columns["upas"] != "all" else ["pm25"]+list(
-                    d.set_attrib("columns"))
-            columns4 = ["pm25correctedrh",
-                        "pm25correctedrhandgrav", "filterid", "grav_not", "grav"]
+            columns3 = ["upas_pm25"] if not all_variables else ["upas_"+i for i in list(d.set_attrib("columns"))]+["upas_pm25"]
+            columns4 = ["upas_pm25_RHcorrected",
+                        "upas_pm25_RHgravcorrected", "upas_filterid", "upas_gravimetric", "upas_gravimetric_blankcorrected"]
             buffer = StringIO()
             with buffer as file:
                 df = writer(file, delimiter=",")
@@ -658,15 +654,13 @@ class Dataset(DictionaryPlus):
                                 app.append(v.m[m] if v.m[m] != None else "")
                             else:
                                 app.append("")
-                        if "upas" not in columns.keys():
-                            app.append(v["PM2_5MC"].iloc[i])
-                        else:
-                            app.append(v["PM2_5MC"].iloc[i])
-                            for col in columns3[1:]:
-                                if col in v.columns:
-                                    app.append(v[col].iloc[i])
-                                else:
-                                    app.append(None)
+
+                        for col in columns3[:-1]:
+                            if col[5:] in v.columns:
+                                app.append(v[col[5:]].iloc[i])
+                            else:
+                                app.append(None)
+                        app.append(v["PM2_5MC"].iloc[i])
                         xx = (a*v["PM2_5MC"].iloc[i])+(b*v["AtmoRH"].iloc[i])+c
                         app.append(xx)
                         if grav != "":
@@ -695,7 +689,7 @@ class Dataset(DictionaryPlus):
             columns1 = ["identifier", "monitor",
                         "start", "end", "length", "datetime", "timedelta"]
             columns2 = list(set(d.meta()))
-            columns3 = ["CO(ppm)"]
+            columns3 = ["lascar_CO(ppm)"]
 
             buffer = StringIO()
             with buffer as file:
@@ -743,9 +737,9 @@ class Dataset(DictionaryPlus):
             columns1 = ["identifier", "monitor",
                         "start", "end", "length", "datetime", "timedelta"]
             columns2 = list(set(d.meta()))
-            columns3 = ["sensorName", "deviceId", "resolution",
-                         "PM2.5", "PM10", "CO2", "NO2", "Temperature", "Humidity"]
-            columns4 = ["pm25correctedrh"]
+            columns3 = ["lcm_sensorName", "lcm_deviceId", "lcm_resolution",
+                        "lcm_PM2.5", "lcm_PM10", "lcm_CO2", "lcm_NO2", "lcm_Temperature", "lcm_Humidity"] if all_variables else ["lcm_PM2.5"]
+            columns4 = ["lcm_PM2.5correctedrh"]
 
             buffer = StringIO()
             with buffer as file:
@@ -774,7 +768,7 @@ class Dataset(DictionaryPlus):
                             else:
                                 app.append("")
                         for m in columns3:
-                            app.append(v[m].iloc[i])
+                            app.append(v[m[4:]].iloc[i])
                         xx = (a*v["PM2.5"].iloc[i])+(b*v["Humidity"].iloc[i])+c
                         app.append(xx)
                         df.writerow(list(map(str, app)))
@@ -793,13 +787,8 @@ class Dataset(DictionaryPlus):
             columns1 = ["identifier", "monitor",
                         "start", "end", "length", "datetime", "timedelta"]
             columns2 = list(set(d.meta()))
-            columns3 = ["pm2_5", "pm2_5_adj"]
-            columns4 = []
-            if "purple" not in columns.keys():
-                columns4 = []
-            else:
-                columns4 = columns["purple"] if columns["purple"] != "all" else list(
-                    d.set_attrib("columns"))
+            columns3 = ["purple_pm25", "purple_pm25_RHcorrected"]
+            columns4 = [] if not all_variables else ["purple_"+i for i in list(d.set_attrib("columns"))]
             buffer = StringIO()
             with buffer as file:
                 df = writer(file, delimiter=",")
@@ -829,17 +818,9 @@ class Dataset(DictionaryPlus):
                         app.append(
                             ((v["pm2_5_cf_1"]+v["pm2_5_cf_1_b"])/2).iloc[i])
                         app.append(v["pm_adj"].iloc[i])
-                        if "purple" in columns.keys():
-                            if columns["purple"] == "all":
-                                for col in list(d.set_attrib("columns")):
-                                    if col in v.columns:
-                                        app.append(v[col].iloc[i])
-                                    else:
-                                        app.append(None)
-                            else:
-                                for col in columns["purple"]:
-                                    if col in v.columns:
-                                        app.append(v[col].iloc[i])
+                        for col in columns4:
+                                if col[6:] in v.columns:
+                                        app.append(v[col[6:]].iloc[i])
                                     else:
                                         app.append(None)
                         df.writerow(list(map(str, app)))

{apmtools-0.2.47 → apmtools-0.2.49}/src/apmtools/shiny/matplotlib_renderer.py

@@ -738,6 +738,11 @@ def _matplotlib_direct_figure(spec, *, title="", x_label="", y_label="",
             for group in (group_names or [None]):
                 for variable in variable_names:
                     key = (variable, group)
+                    # A visible element may be only one of several Y variables
+                    # within a group. Never create proxy legend entries for
+                    # combinations with no plotted observations.
+                    if key not in active:
+                        continue
                     label = f"{group}, {variable}" if group is not None else variable
                     legend_handles.append(Line2D([], [], color=multi_colors[key], linestyle=multi_dashes[key], linewidth=line_width))
                     legend_labels_out.append(rename.get(label, label))

{apmtools-0.2.47 → apmtools-0.2.49}/src/apmtools/shiny/ui.py

@@ -479,7 +479,7 @@ if (!window.__apmColorPickerInstalled) {
                         if not np.isfinite(bound):
                             continue
                         mask = values.gt(bound) if comparison == "gt" else values.lt(bound)
-                        current = current.loc[mask.fillna(False)].copy()
+                        current = current.loc[mask.fillna(False) | values.isna()].copy()
                         values = values.loc[current.index]
                 return current
 
@@ -499,7 +499,11 @@ if (!window.__apmColorPickerInstalled) {
 
             def _label_string(field):
                 # Internal adapter for the existing renderer/export APIs.
-                keys = _label_keys[field].get()
+                # Label discovery is downstream of figure rendering. Do not
+                # subscribe the figure to its own discovered key set: this
+                # otherwise forms plot -> legend keys -> plot feedback cycles.
+                with reactive.isolate():
+                    keys = _label_keys[field].get()
                 values = _label_values[field].get()
                 return "; ".join(f"{key}={values.get(key, key)}" for key in keys
                                  if values.get(key, key) != key)
@@ -532,6 +536,12 @@ if (!window.__apmColorPickerInstalled) {
                     @reactive.effect
                     def _watch():
                         keys = _label_keys[field].get()
+                        # A plot-type transition unmounts the old inputs asynchronously.
+                        # Do not consume values from the previous plot's editors while
+                        # Shiny is replacing their DOM nodes.
+                        with reactive.isolate():
+                            if not keys:
+                                return
                         # Read current mappings without subscribing this watcher to
                         # its own writes: otherwise each keystroke can retrigger it.
                         with reactive.isolate():
@@ -742,6 +752,13 @@ if (!window.__apmColorPickerInstalled) {
                 if not choices:
                     return ui.help_text(f"No compatible X variables for {kind}.")
                 selected = initial_filters.get("x", [])
+                # This control is remounted on plot-type changes. Never feed
+                # a datetime line X into a categorical box/bar selectize:
+                # Shiny otherwise has to reconcile a selection absent from
+                # the new choice set while dependent reactive plots run.
+                candidate = [selected] if isinstance(selected, str) else list(selected or [])
+                candidate = [value for value in candidate if value in choices]
+                selected = candidate if multiple else (candidate[0] if candidate else "")
                 if multiple:
                     return ui.input_selectize(
                         "x", "X-axis / variables" if kind in ("scatter", "histogram") else "X-axis / categories",
@@ -788,8 +805,11 @@ if (!window.__apmColorPickerInstalled) {
             @reactive.event(input.group_by, ignore_none=False)
             def sync_panel_group_choices():
                 selected = list(input.group_by() or [])
+                with reactive.isolate():
+                    current_panels = list(_optional_input("panel_by", []) or [])
+                valid_panels = [name for name in current_panels if name in selected]
                 ui.update_selectize("panel_by", choices={name: name for name in selected},
-                                    selected=selected)
+                                    selected=valid_panels)
 
             @render.ui
             def frequency_options():
@@ -800,6 +820,34 @@ if (!window.__apmColorPickerInstalled) {
                     ui.input_checkbox("flooring_timestamp", "Floor timestamps", value=initial_filters.get("flooring_timestamp", True)),
                 )
 
+            # The virtual group choices depend on plot type and selected axes,
+            # not on the Group by value. Updating a selectize control while
+            # subscribing to that same control can create an invalidation loop,
+            # especially during a line -> box/bar transition with multiple Y's.
+            _last_axis_group_choices = reactive.value(None)
+
+            @reactive.effect
+            def sync_axis_group_choices():
+                kind = input.plot_type()
+                x_raw = _optional_input("x", [])
+                y_raw = _optional_input("y", [])
+                xs = [x_raw] if isinstance(x_raw, str) else list(x_raw or [])
+                ys = [y_raw] if isinstance(y_raw, str) else list(y_raw or [])
+                choices = list(group_columns)
+                if kind in ("histogram", "scatter") and len(xs) > 1:
+                    choices.append("variables_x")
+                if kind != "histogram" and len(ys) > 1:
+                    choices.append("variables_y")
+                signature = tuple(choices)
+                with reactive.isolate():
+                    previous = _last_axis_group_choices.get()
+                    current = list(_optional_input("group_by", []) or [])
+                if signature == previous:
+                    return
+                _last_axis_group_choices.set(signature)
+                selected = [g for g in current if g in choices]
+                ui.update_selectize("group_by", choices={c: c for c in choices}, selected=selected)
+
             @reactive.calc
             def selected_data():
                 current = filtered_summary()
@@ -830,7 +878,8 @@ if (!window.__apmColorPickerInstalled) {
                 ):
                     return pd.DataFrame()
 
-                selected_groups = list(input.group_by() or [])
+                selected_groups = [g for g in (input.group_by() or [])
+                                   if g not in ("variables_x", "variables_y")]
                 # Derive hour/day/etc. through group_stat without aggregation.
                 # The returned index column identifies source rows.
                 for component in selected_groups:
@@ -908,6 +957,7 @@ if (!window.__apmColorPickerInstalled) {
                 y_input = None if selected_plot == "histogram" else input.y()
                 selected_y = ([y_input] if isinstance(y_input, str) else list(y_input or []))
                 selected_groups = list(input.group_by() or [])
+                physical_groups = [g for g in selected_groups if g not in ("variables_x", "variables_y")]
                 frequency = FREQUENCIES.get(input.frequency())
                 should_aggregate = AGGREGATES.get(input.aggregate()) is not None
 
@@ -919,6 +969,13 @@ if (!window.__apmColorPickerInstalled) {
                     selected_plot != "histogram" and not selected_y
                 ):
                     return {"error": "No data for the selected filters"}
+                # The X widget is replaced asynchronously by render.ui. Until
+                # the browser mounts it, the old line X can remain in input.x.
+                # Treat that intermediate state as unready, not as box data.
+                if selected_plot in ("box", "bar") and any(
+                    x not in categorical_columns for x in selected_x
+                ):
+                    return {"error": "Waiting for categorical X-axis selection"}
 
                 aggregate = AGGREGATES.get(input.aggregate())
                 def mapped(column):
@@ -954,16 +1011,35 @@ if (!window.__apmColorPickerInstalled) {
                 if selected_plot == "histogram" and len(x_variables) > 1:
                     from .histogram_multi import histogram_long_data
                     plot_df = histogram_long_data(plot_df, x_variables, group_columns=[
-                        column_map[c] for c in selected_groups if column_map[c] in plot_df.columns
+                        column_map[c] for c in physical_groups if column_map[c] in plot_df.columns
                     ])
+                    plot_df["variables_x"] = plot_df["__hist_variable"]
                     x_column = "__hist_value"
                     x_label_override = " | ".join(x_variables)
 
+                if (selected_plot == "scatter" and "variables_x" in selected_groups
+                        and len(x_variables) > 1):
+                    id_columns = [c for c in plot_df.columns if c not in x_variables]
+                    plot_df = plot_df.melt(id_vars=id_columns, value_vars=x_variables,
+                                           var_name="variables_x", value_name="__axis_x_value")
+                    x_column = "__axis_x_value"
+                    x_variables = [x_column]
+
                 if selected_plot in ("box", "bar"):
                     plot_df = plot_df.copy(deep=False)
                     plot_df["__plot_category"] = _composite_labels(plot_df, x_columns)
                     x_column = "__plot_category"
 
+                if "variables_y" in selected_groups and len(y_columns) > 1:
+                    # Make the selected Y variable an actual categorical dimension,
+                    # so it works with ordinary grouping and panel partitioning.
+                    id_columns = [c for c in plot_df.columns if c not in y_columns]
+                    plot_df = plot_df.melt(id_vars=id_columns, value_vars=y_columns,
+                                           var_name="variables_y", value_name="__axis_y_value")
+                    y_columns = ["__axis_y_value"]
+                    # The categorical X labels have already been computed above.
+                    # Scatter and bar/box now use the standard single-Y renderer.
+
                 # Convert durations once for Plotly, Matplotlib, editable
                 # numeric bounds, faceting and exported plots. Retain the
                 # original variable name and label its displayed unit.
@@ -980,8 +1056,12 @@ if (!window.__apmColorPickerInstalled) {
                 # Multiple grouping columns are supported by group_stat(). For
                 # plotting, Plotly needs one color/category column, so combine the
                 # selected grouping columns into a readable composite label.
-                group_columns = [column_map[c] for c in selected_groups
+                group_columns = [column_map[c] for c in physical_groups
                                  if column_map[c] in plot_df.columns]
+                if "variables_x" in selected_groups and "variables_x" in plot_df:
+                    group_columns.append("variables_x")
+                if "variables_y" in selected_groups and "variables_y" in plot_df:
+                    group_columns.append("variables_y")
                 if group_columns:
                     plot_df = plot_df.copy(deep=False)
                     plot_df["__plot_group"] = (
@@ -1317,6 +1397,11 @@ if (!window.__apmColorPickerInstalled) {
                         ui.update_text(field, value="")
                 for field in ("legend_labels", "x_tick_labels", "y_tick_labels", "panel_titles"):
                     _set_label_keys(field, ())
+                # Invalidate figure-derived editor identities immediately. The
+                # previous lineplot legend/ticks must never be treated as boxplot
+                # identities during the asynchronous input transition.
+                rendered_legend_keys.set(())
+                rendered_tick_keys.set(((), ()))
                 _color_keys.set(())
                 ui.update_select("palette", selected="Default")
                 ui.update_select("template", selected="plotly")
@@ -1397,7 +1482,12 @@ if (!window.__apmColorPickerInstalled) {
                 from .appearance import _parse_label_map
                 with reactive.isolate():
                     mapping = _parse_label_map(_label_string("legend_labels"))
-                reverse = {v: k for k, v in mapping.items() if v != k}
+                # Resolve displayed labels against stable, original keys.  A
+                # reverse dictionary is unsafe: two different keys may have
+                # the same edited label, and mapping order then makes keys
+                # alternate as the figure is rendered repeatedly.
+                with reactive.isolate():
+                    known_keys = _label_keys["legend_labels"].get()
                 if is_plotly:
                     if getattr(fig.layout, "showlegend", None) is False:
                         labels = []
@@ -1408,8 +1498,22 @@ if (!window.__apmColorPickerInstalled) {
                     legends = list(getattr(fig, "legends", []))
                     legends += [ax.get_legend() for ax in fig.axes if ax.get_legend() is not None]
                     labels = [txt.get_text() for leg in legends for txt in leg.get_texts()]
-                keys = tuple(dict.fromkeys(reverse.get(label, label) for label in labels
-                    if label.strip() and label not in ("Y variable", "Grouping", "Legend", "All observations")))
+                excluded = ("Y variable", "Grouping", "Legend", "All observations")
+                labels = [label for label in labels if label.strip() and label not in excluded]
+                # If this is merely a relabelled rendering of the existing
+                # traces, do not rediscover/rename their identities.
+                expected = [mapping.get(key, key) for key in known_keys]
+                if known_keys and set(labels) == set(expected):
+                    keys = tuple(known_keys)
+                else:
+                    reverse = {}
+                    for key in known_keys:
+                        display = mapping.get(key, key)
+                        reverse.setdefault(display, []).append(key)
+                    keys = tuple(dict.fromkeys(
+                        reverse[label][0] if len(reverse.get(label, ())) == 1
+                        else label for label in labels
+                    ))
                 with reactive.isolate():
                     old = rendered_legend_keys.get()
                 if keys != old:
@@ -1847,7 +1951,7 @@ if (!window.__apmColorPickerInstalled) {
                     if not np.isfinite(bound):
                         continue
                     mask = values.gt(bound) if suffix == "gt" else values.lt(bound)
-                    current = current.loc[mask.fillna(False)].copy()
+                    current = current.loc[mask.fillna(False) | values.isna()].copy()
                     values = values.loc[current.index]
             if current.empty:
                 return current

apmtools-0.2.49/src/apmtools/units.py

@@ -0,0 +1,190 @@
+upas_units = {'upas_AccelComplianceCnt': '#',
+              'upas_AccelComplianceHrs': 'hrs',
+              'upas_AccelT': '°C',
+              'upas_AccelX': 'mg',
+              'upas_AccelXMax': 'mg',
+              'upas_AccelXMin': 'mg',
+              'upas_AccelXVar': 'mg',
+              'upas_AccelY': 'mg',
+              'upas_AccelYMax': 'mg',
+              'upas_AccelYMin': 'mg',
+              'upas_AccelYVar': 'mg',
+              'upas_AccelZ': 'mg',
+              'upas_AccelZMax': 'mg',
+              'upas_AccelZMin': 'mg',
+              'upas_AccelZVar': 'mg',
+              'upas_AtmoAlt': 'm',
+              'upas_AtmoDensity': 'g L-1',
+              'upas_AtmoP': 'hPa',
+              'upas_AtmoRH': '%',
+              'upas_AtmoT': '°C',
+              'upas_BCS1': 'bool',
+              'upas_BCS2': 'bool',
+              'upas_BC_NPG': 'bool',
+              'upas_BFGenergy': 'integer',
+              'upas_BattVolt': 'V',
+              'upas_BatteryCharge': '%',
+              'upas_CO2': 'ppm',
+              'upas_Charging': 'bool',
+              'upas_DateTimeUTC': 'HH:MM:SS',
+              'upas_Dead': 'bool',
+              'upas_ExtPow': '-',
+              'upas_FLOWCTL': 's',
+              'upas_FdpT': '°C',
+              'upas_FilterDP': 'Pa',
+              'upas_GPSQual': '-',
+              'upas_GPSRT': 's',
+              'upas_GPSalt': 'm',
+              'upas_GPShDOP': '-',
+              'upas_GPSlat': 'decimalDegree',
+              'upas_GPSlon': 'decimalDegree',
+              'upas_GPSsat': '#',
+              'upas_GPSspeed': 'm s-1',
+              'upas_HighVisRaw': '-',
+              'upas_IRRaw': '-',
+              'upas_LUX': 'lux',
+              'upas_LowVisRaw': '-',
+              'upas_MFSVout': 'V',
+              'upas_MassFlow': 'g min-1',
+              'upas_MassFlowFactory': 'g min-1',
+              'upas_NOXRaw': '-',
+              'upas_OverallFlowFactory': 'L min-1',
+              'upas_OverallFlowOffset': 'L min-1',
+              'upas_OverallFlowRate': 'L min-1)',
+              'upas_PCB1T': '°C',
+              'upas_PCB2P': 'hPa',
+              'upas_PCB2T': '°C',
+              'upas_PM0_5NC': '# cm-3',
+              'upas_PM0_5NCVar': '# cm-3',
+              'upas_PM10MC': 'µg m-3',
+              'upas_PM10MCVar': 'µg m-3',
+              'upas_PM10NC': '# cm-3',
+              'upas_PM10NCVar': '# cm-3',
+              'upas_PM1MC': 'µg m-3',
+              'upas_PM1MCVar': 'µg m-3',
+              'upas_PM1NC': '# cm-3',
+              'upas_PM1NCVar': '# cm-3',
+              'upas_PM2_5MC': 'μg/m3',
+              'upas_PM2_5MCVar': 'µg m-3',
+              'upas_PM2_5NC': '# cm-3',
+              'upas_PM2_5NCVar': '# cm-3',
+              'upas_PM2_5SampledMass': 'µg',
+              'upas_PM2_5SampledMassFactory': 'μg',
+              'upas_PM2_5SampledMassOffset': 'μg',
+              'upas_PM4MC': 'µg m-3',
+              'upas_PM4MCVar': 'µg m-3',
+              'upas_PM4NC': '# cm-3',
+              'upas_PM4NCVar': '# cm-3',
+              'upas_PMFanErrorCnt': '#',
+              'upas_PMFanSpeedWarn': '#',
+              'upas_PMLaserErrorCnt': '#',
+              'upas_PMMeasCnt': '#',
+              'upas_PMReadingErrorCnt': '#',
+              'upas_PMtypicalParticleSize': 'µm',
+              'upas_PMtypicalParticleSizeVar': 'µm',
+              'upas_PT100R': 'Ω',
+              'upas_PumpPow1': 'integer',
+              'upas_PumpPow2': 'integer',
+              'upas_PumpV': 'V',
+              'upas_PumpingFlowFactory': 'L min-1',
+              'upas_PumpingFlowOffset': 'L min-1',
+              'upas_PumpingFlowRate': 'L min-1)',
+              'upas_PumpsON': 'bool',
+              'upas_RotX': 'mdeg s-1',
+              'upas_RotXMax': 'mdeg s-1',
+              'upas_RotXMin': 'mdeg s-1',
+              'upas_RotXVar': 'mdeg s-1',
+              'upas_RotY': 'mdeg s-1',
+              'upas_RotYMax': 'mdeg s-1',
+              'upas_RotYMin': 'mdeg s-1',
+              'upas_RotYVar': 'mdeg s-1',
+              'upas_RotZ': 'mdeg s-1',
+              'upas_RotZMax': 'mdeg s-1',
+              'upas_RotZMin': 'mdeg s-1',
+              'upas_RotZVar': 'mdeg s-1',
+              'upas_SCDRH': '%',
+              'upas_SCDT': '°C',
+              'upas_SD_DATAW': 's',
+              'upas_SD_HEADW': 's',
+              'upas_SampleTime': '',
+              'upas_SampledVolume': 'L',
+              'upas_SampledVolumeFactory': 'L',
+              'upas_SampledVolumeOffset': 'L',
+              'upas_StepCount': '#',
+              'upas_TPumpsOFF': 's',
+              'upas_TPumpsON': 's',
+              'upas_U12T': '°C',
+              'upas_U29P': '°C',
+              'upas_U29T': '°C',
+              'upas_UVRaw': '-',
+              'upas_UVindex': '-',
+              'upas_UnixTime': 's',
+              'upas_VOCRaw': '-',
+              'upas_XDown': '%',
+              'upas_Xup': '%',
+              'upas_Ydown': '%',
+              'upas_Yup': '%',
+              'upas_Zdown': '%',
+              'upas_Zup': '%',
+              'upas_cartridgeid': '-',
+              'end': 'YYYY-MM-DDTHH:MM:SS',
+              'index': '-',
+              'length': 'days HH:MM:SS',
+              'upas_pm25': 'µg m-3',
+              'upas_pm25_RHcorrected': 'µg m-3',
+              "upas_filterid":"-", 
+              "upas_gravimetric": "µg m-3",
+              "upas_gravimetric_blankcorrected": "µg m-3",
+              'start': 'YYYY-MM-DDTHH:MM:SS',
+              'time': 'YYYY-MM-DDTHH:MM:SS',
+              'upas_upasid': '-',
+              'upas_v3_3': 'V',
+              'upas_v5': 'V'}
+
+lascar_units = {"lascar_CO(ppm)":"ppm"}
+
+
+lcm_units = {"lcm_sensorName": "-", "lcm_deviceId": "-", "lcm_resolution": "-", "lcm_PM2.5": "µg m-3","lcm_PM10": "µg m-3", "lcm_CO2": "ppm", "lcm_NO2": "ppm", "lcm_Temperature": "°C", "lcm_Humidity": "%", "lcm_PM2.5correctedrh": "µg m-3"}
+
+purple_units = {'purple_mac_address': '-',
+                'purple_firmware_ver': '-',
+                'purple_hardware': '-',
+                'purple_current_temp_f': 'F',
+                'purple_current_humidity': '%',
+                'purple_current_dewpoint_f': 'F',
+                'purple_pressure': 'mBar',
+                'purple_adc': '',
+                'purple_mem': '',
+                'purple_rssi': '',
+                'purple_uptime': '',
+                'purple_pm1_0_cf_1': 'μg m-3',
+                'purple_pm2_5_cf_1': 'μg m-3',
+                'purple_pm10_0_cf_1': 'μg m-3',
+                'purple_pm1_0_atm': 'μg m-3',
+                'purple_pm2_5_atm': 'μg m-3',
+                'purple_pm10_0_atm': 'μg m-3',
+                'purple_pm2.5_aqi_cf_1': 'μg m-3',
+                'purple_pm2.5_aqi_atm': 'μg m-3',
+                'purple_p_0_3_um': '#',
+                'purple_p_0_5_um': '#',
+                'purple_p_1_0_um': '#',
+                'purple_p_2_5_um': '#',
+                'purple_p_5_0_um': '#',
+                'purple_p_10_0_um': '#',
+                'purple_pm1_0_cf_1_b': 'μg m-3',
+                'purple_pm2_5_cf_1_b': 'μg m-3',
+                'purple_pm10_0_cf_1_b': 'μg m-3',
+                'purple_pm1_0_atm_b': 'μg m-3',
+                'purple_pm2_5_atm_b': 'μg m-3',
+                'purple_pm10_0_atm_b': 'μg m-3',
+                'purple_pm2.5_aqi_cf_1_b': 'μg m-3',
+                'purple_pm2.5_aqi_atm_b': 'μg m-3',
+                'purple_p_0_3_um_b': '#',
+                'purple_p_0_5_um_b': '#',
+                'purple_p_1_0_um_b': '#',
+                'purple_p_2_5_um_b': '#',
+                'purple_p_5_0_um_b': '#',
+                'purple_p_10_0_um_b': '#',
+                'purple_gas': '',
+                'purple_pm25': 'μg m-3',
+                "purple_pm25_RHcorrected": "μg m-3"}

apmtools-0.2.47/src/apmtools/units.py

@@ -1,390 +0,0 @@
-upas_units = {'AccelComplianceCnt': '#',
- 'AccelComplianceHrs': 'hrs',
- 'AccelT': '°C',
- 'AccelX': 'mg',
- 'AccelXMax': 'mg',
- 'AccelXMin': 'mg',
- 'AccelXVar': 'mg',
- 'AccelY': 'mg',
- 'AccelYMax': 'mg',
- 'AccelYMin': 'mg',
- 'AccelYVar': 'mg',
- 'AccelZ': 'mg',
- 'AccelZMax': 'mg',
- 'AccelZMin': 'mg',
- 'AccelZVar': 'mg',
- 'AtmoAlt': 'm',
- 'AtmoDensity': 'g L-1',
- 'AtmoP': 'hPa',
- 'AtmoRH': '%',
- 'AtmoT': '°C',
- 'BCS1': 'bool',
- 'BCS2': 'bool',
- 'BC_NPG': 'bool',
- 'BFGenergy': 'integer',
- 'BattVolt': 'V',
- 'BatteryCharge': '%',
- 'CO2': 'ppm',
- 'Charging': 'bool',
- 'DateTimeUTC': 'HH:MM:SS',
- 'Dead': 'bool',
- 'ExtPow': '-',
- 'FLOWCTL': 's',
- 'FdpT': '°C',
- 'FilterDP': 'Pa',
- 'GPSQual': '-',
- 'GPSRT': 's',
- 'GPSalt': 'm',
- 'GPShDOP': '-',
- 'GPSlat': 'decimalDegree',
- 'GPSlon': 'decimalDegree',
- 'GPSsat': '#',
- 'GPSspeed': 'm s-1',
- 'HighVisRaw': '-',
- 'IRRaw': '-',
- 'LUX': 'lux',
- 'LowVisRaw': '-',
- 'MFSVout': 'V',
- 'MassFlow': 'g min-1',
-              'MassFlowFactory': 'g min-1',
- 'NOXRaw': '-',
-              'OverallFlowFactory': 'L min-1',
-              'OverallFlowOffset': 'L min-1',
- 'OverallFlowRate': 'L min-1)',
- 'PCB1T': '°C',
- 'PCB2P': 'hPa',
- 'PCB2T': '°C',
- 'PM0_5NC': '# cm-3',
- 'PM0_5NCVar': '# cm-3',
- 'PM10MC': 'µg m-3',
- 'PM10MCVar': 'µg m-3',
- 'PM10NC': '# cm-3',
- 'PM10NCVar': '# cm-3',
- 'PM1MC': 'µg m-3',
- 'PM1MCVar': 'µg m-3',
- 'PM1NC': '# cm-3',
- 'PM1NCVar': '# cm-3',
- 'PM2_5MC': 'μg/m3',
- 'PM2_5MCVar': 'µg m-3',
- 'PM2_5NC': '# cm-3',
- 'PM2_5NCVar': '# cm-3',
- 'PM2_5SampledMass': 'µg',
-              'PM2_5SampledMassFactory': 'μg',
-              'PM2_5SampledMassOffset': 'μg',
- 'PM4MC': 'µg m-3',
- 'PM4MCVar': 'µg m-3',
- 'PM4NC': '# cm-3',
- 'PM4NCVar': '# cm-3',
- 'PMFanErrorCnt': '#',
- 'PMFanSpeedWarn': '#',
- 'PMLaserErrorCnt': '#',
- 'PMMeasCnt': '#',
- 'PMReadingErrorCnt': '#',
- 'PMtypicalParticleSize': 'µm',
- 'PMtypicalParticleSizeVar': 'µm',
- 'PT100R': 'Ω',
- 'PumpPow1': 'integer',
- 'PumpPow2': 'integer',
- 'PumpV': 'V',
-              'PumpingFlowFactory': 'L min-1',
-              'PumpingFlowOffset': 'L min-1',
- 'PumpingFlowRate': 'L min-1)',
- 'PumpsON': 'bool',
- 'RotX': 'mdeg s-1',
- 'RotXMax': 'mdeg s-1',
- 'RotXMin': 'mdeg s-1',
- 'RotXVar': 'mdeg s-1',
- 'RotY': 'mdeg s-1',
- 'RotYMax': 'mdeg s-1',
- 'RotYMin': 'mdeg s-1',
- 'RotYVar': 'mdeg s-1',
- 'RotZ': 'mdeg s-1',
- 'RotZMax': 'mdeg s-1',
- 'RotZMin': 'mdeg s-1',
- 'RotZVar': 'mdeg s-1',
- 'SCDRH': '%',
- 'SCDT': '°C',
- 'SD_DATAW': 's',
- 'SD_HEADW': 's',
- 'SampleTime': '',
- 'SampledVolume': 'L',
- 'SampledVolumeFactory': 'L',
- 'SampledVolumeOffset': 'L',
- 'StepCount': '#',
- 'TPumpsOFF': 's',
- 'TPumpsON': 's',
-              'U12T': '°C',
-              'U29P': '°C',
-              'U29T': '°C',
- 'UVRaw': '-',
- 'UVindex': '-',
- 'UnixTime': 's',
- 'VOCRaw': '-',
- 'XDown': '%',
- 'Xup': '%',
- 'Ydown': '%',
- 'Yup': '%',
- 'Zdown': '%',
- 'Zup': '%',
- 'cartridgeid': '-',
- 'end': 'YYYY-MM-DDTHH:MM:SS',
- 'index': '-',
-              'length': 'days HH:MM:SS',
-              'pm25': 'µg m-3',
-              'pm25correctedrh': 'µg m-3',
-              'start': 'YYYY-MM-DDTHH:MM:SS',
-              'time': 'YYYY-MM-DDTHH:MM:SS',
- 'upasid': '-',
- 'v3_3': 'V',
- 'v5': 'V'}
-
-upas_datatype = {'AccelComplianceCnt': 'integer',
-                 'AccelComplianceHrs': 'timedelta',
-                 'AccelT': 'numeric',
-                 'AccelX': 'numeric',
-                 'AccelXMax': 'numeric',
-                 'AccelXMin': 'numeric',
-                 'AccelXVar': 'numeric',
-                 'AccelY': 'numeric',
-                 'AccelYMax': 'numeric',
-                 'AccelYMin': 'numeric',
-                 'AccelYVar': 'numeric',
-                 'AccelZ': 'numeric',
-                 'AccelZMax': 'numeric',
-                 'AccelZMin': 'numeric',
-                 'AccelZVar': 'numeric',
-                 'AtmoAlt': 'numeric',
-                 'AtmoDensity': 'numeric',
-                 'AtmoP': 'numeric',
-                 'AtmoRH': 'numeric',
-                 'AtmoT': 'numeric',
-                 'BCS1': 'bool',
-                 'BCS2': 'bool',
-                 'BC_NPG': 'bool',
-                 'BFGenergy': 'integer',
-                 'BattVolt': 'numeric',
-                 'BatteryCharge': '%',
-                 'CO2': 'numeric',
-                 'Charging': 'bool',
-                 'DateTimeUTC': 'datetime',
-                 'Dead': 'bool',
-                 'ExtPow': 'bool',
-                 'FLOWCTL': 'timedelta',
-                 'FdpT': 'numeric',
-                 'FilterDP': 'numeric',
-                 'GPSQual': 'text',
-                 'GPSRT': 'timedelta',
-                 'GPSalt': 'numeric',
-                 'GPShDOP': '',
-                 'GPSlat': 'numeric',
-                 'GPSlon': 'numeric',
-                 'GPSsat': 'integer',
-                 'GPSspeed': 'numeric',
-                 'HighVisRaw': '',
-                 'IRRaw': '',
-                 'LUX': 'numeric',
-                 'LowVisRaw': '',
-                 'MFSVout': 'numeric',
-                 'MassFlow': 'numeric',
-                 'MassFlowFactory': 'numeric',
-                 'NOXRaw': 'numeric',
-                 'OverallFlowFactory': 'numeric',
-                 'OverallFlowOffset': 'numeric',
-                 'OverallFlowRate': 'numeric',
-                 'PCB1T': 'numeric',
-                 'PCB2P': 'numeric',
-                 'PCB2T': 'numeric',
-                 'PM0_5NC': 'integer',
-                 'PM0_5NCVar': 'numeric',
-                 'PM10MC': 'numeric',
-                 'PM10MCVar': 'numeric',
-                 'PM10NC': 'numeric',
-                 'PM10NCVar': 'numeric',
-                 'PM1MC': 'numeric',
-                 'PM1MCVar': 'numeric',
-                 'PM1NC': 'numeric',
-                 'PM1NCVar': 'numeric',
-                 'PM2_5MC': 'numeric',
-                 'PM2_5MCVar': 'numeric',
-                 'PM2_5NC': 'numeric',
-                 'PM2_5NCVar': 'numeric',
-                 'PM2_5SampledMass': 'numeric',
-                 'PM2_5SampledMassFactory': 'numeric',
-                 'PM2_5SampledMassOffset': 'numeric',
-                 'PM4MC': 'numeric',
-                 'PM4MCVar': 'numeric',
-                 'PM4NC': 'numeric',
-                 'PM4NCVar': 'numeric',
-                 'PMFanErrorCnt': 'numeric',
-                 'PMFanSpeedWarn': 'bool',
-                 'PMLaserErrorCnt': 'numeric',
-                 'PMMeasCnt': 'numeric',
-                 'PMReadingErrorCnt': 'numeric',
-                 'PMtypicalParticleSize': 'numeric',
-                 'PMtypicalParticleSizeVar': 'numeric',
-                 'PT100R': 'numeric',
-                 'PumpPow1': 'numeric',
-                 'PumpPow2': 'numeric',
-                 'PumpV': 'numeric',
-                 'PumpingFlowFactory': 'numeric',
-                 'PumpingFlowOffset': 'numeric',
-                 'PumpingFlowRate': 'numeric',
-                 'PumpsON': 'bool',
-                 'RotX': 'numeric',
-                 'RotXMax': 'numeric',
-                 'RotXMin': 'numeric',
-                 'RotXVar': 'numeric',
-                 'RotY': 'numeric',
-                 'RotYMax': 'numeric',
-                 'RotYMin': 'numeric',
-                 'RotYVar': 'numeric',
-                 'RotZ': 'numeric',
-                 'RotZMax': 'numeric',
-                 'RotZMin': 'numeric',
-                 'RotZVar': 'numeric',
-                 'SCDRH': 'numeric',
-                 'SCDT': 'numeric',
-                 'SD_DATAW': 'timedelta',
-                 'SD_HEADW': 'timedelta',
-                 'SampleTime': 'datetime',
-                 'SampledVolume': 'numeric',
-                 'SampledVolumeFactory': 'numeric',
-                 'SampledVolumeOffset': 'numeric',
-                 'StepCount': 'numeric',
-                 'TPumpsOFF': 'bool',
-                 'TPumpsON': 'bool',
-                 'U12T': 'numeric',
-                 'U29P': 'numeric',
-                 'U29T': 'numeric',
-                 'UVRaw': 'numeric',
-                 'UVindex': 'numeric',
-                 'UnixTime': 'datetime',
-                 'VOCRaw': 'numeric',
-                 'XDown': 'numeric',
-                 'Xup': 'numeric',
-                 'Ydown': 'numeric',
-                 'Yup': 'numeric',
-                 'Zdown': 'numeric',
-                 'Zup': 'numeric',
-                 'end': 'datetime',
-                 'length': 'timedelta',
-                 'pm25': 'numeric',
-                 'pm25correctedrh': 'numeric',
-                 'start': 'datetime',
-                 'time': 'datetime',
-                 'v3_3': 'numeric',
-                 'v5': 'numeric'}
-
-lascar_units = {"CO(ppm)":"ppm"}
-
-
-lcm_units = {"sensorName": "-", "deviceId": "-", "resolution": "-", "PM2.5": "µg m-3",
-             "PM10": "µg m-3", "CO2": "ppm", "NO2": "ppm", "Temperature": "°C", "Humidity": "%"}
-
-lascar_datatype = {"CO(ppm)": "numeric",
-                   'start': "datetime",
-                   'end': "datetime",
-                   'length': "timedelta",
-                   'time': "datetime"}
-
-purple_units = {'mac_address':"-",
-          'firmware_ver':"-",
-          'hardware':"-",
-          'current_temp_f':"F",
-          'current_humidity':"%",
-          'current_dewpoint_f':"F",
-          'pressure':"mBar",
-          'adc':"",
-          'mem':"",
-          'rssi':"",
-          'uptime':"",
-                'pm1_0_cf_1': "μg m-3",
-                'pm2_5_cf_1': "μg m-3",
-                'pm10_0_cf_1': "μg m-3",
-                'pm1_0_atm': "μg m-3",
-                'pm2_5_atm': "μg m-3",
-                'pm10_0_atm': "μg m-3",
-                'pm2.5_aqi_cf_1': "μg m-3",
-                'pm2.5_aqi_atm': "μg m-3",
-          'p_0_3_um':"#",
-          'p_0_5_um':"#",
-          'p_1_0_um':"#",
-          'p_2_5_um':"#",
-          'p_5_0_um':"#",
-          'p_10_0_um':"#",
-                'pm1_0_cf_1_b': "μg m-3",
-                'pm2_5_cf_1_b': "μg m-3",
-                'pm10_0_cf_1_b': "μg m-3",
-                'pm1_0_atm_b': "μg m-3",
-                'pm2_5_atm_b': "μg m-3",
-                'pm10_0_atm_b': "μg m-3",
-                'pm2.5_aqi_cf_1_b': "μg m-3",
-                'pm2.5_aqi_atm_b': "μg m-3",
-          'p_0_3_um_b':"#",
-          'p_0_5_um_b':"#",
-          'p_1_0_um_b':"#",
-          'p_2_5_um_b':"#",
-          'p_5_0_um_b':"#",
-          'p_10_0_um_b':"#",
-          'gas':"",
-          'pm_adj': "μg m-3"}
-
-purple_datatype = {'mac_address': "text",
-                'firmware_ver': "text",
-                'hardware': "text",
-                'current_temp_f': "numeric",
-                'current_humidity': "numeric",
-                'current_dewpoint_f': "numeric",
-                'pressure': "numeric",
-                'adc': "text",
-                'mem': "text",
-                'rssi': "text",
-                'uptime': "text",
-                   'pm1_0_c': "numeric",
-                 'PumpingFlowFactory': 'numeric',
-                 'PumpingFlowOffset': 'numeric',
-                 'PumpingFlowRate': 'numeric',
-                 'PumpsON': 'bool',
-                 'RotX': 'numeric',
-                 'RotXMax': 'numeric',
-                 'RotXMin': 'numeric',
-                 'RotXVar': 'numeric',
-                 'RotY': 'numeric',
-                 'RotYMax': 'numeric',
-                 'RotYMin': 'numeric',
-                 'RotYVar': 'numeric',
-                 'RotZ': 'numeric',
-                 'pm1_0_cf_1': "numeric",
-                   'pm2_5_cf_1': "numeric",
-                   'pm10_0_cf_1': "numeric",
-                'pm1_0_atm': "numeric",
-                'pm2_5_atm': "numeric",
-                   'pm10_0_atm': "numeric",
-                'pm2.5_aqi_cf_1': "numeric",
-                   'pm2.5_aqi_atm': "numeric",
-                'p_0_3_um': "numeric",
-                'p_0_5_um': "numeric",
-                   'p_1_0_um': "numeric",
-                'p_2_5_um': "numeric",
-                   'p_5_0_um': "numeric",
-                'p_10_0_um': "numeric",
-                   'pm1_0_cf_1_b': "numeric",
-                   'pm2_5_cf_1_b': "numeric",
-                   'pm10_0_cf_1_b': "numeric",
-                   'pm1_0_atm_b': "numeric",
-                   'pm2_5_atm_b': "numeric",
-                   'pm10_0_atm_b': "numeric",
-                'pm2.5_aqi_cf_1_b': "numeric",
-                'pm2.5_aqi_atm_b': "numeric",
-                'p_0_3_um_b': "numeric",
-                'p_0_5_um_b': "numeric",
-                   'p_1_0_um_b': "numeric",
-                'p_2_5_um_b': "numeric",
-                'p_5_0_um_b': "numeric",
-                   'p_10_0_um_b': "numeric",
-                'gas': "text",
-                   'pm_adj': "numeric",
-                   'start':"datetime",
-                   'end':"datetime",
-                   'length':"timedelta",
-                   'time':"datetime"}