apmtools 0.2.1__tar.gz → 0.2.3__tar.gz

{apmtools-0.2.1 → apmtools-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: apmtools
-Version: 0.2.001
+Version: 0.2.003
 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.1 → apmtools-0.2.3}/pyproject.toml

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

{apmtools-0.2.1 → apmtools-0.2.3}/src/apmtools/classes.py

@@ -476,7 +476,7 @@ class Dataset(DictionaryPlus):
                     self.scan_folder(directory=f"{directory}{j}/", levels=levels,
                                      level=level+1, monitor=monitor, levels_dict=levels_dict, gmt_timezone_shift=gmt_timezone_shift, interpolate=interpolate, add_m=add_m)
 
-    def save_summary(self, save_csv=True, filename="./", columns={}):
+    def save_summary(self, save_csv=True, filename="./", columns={}, merged=True):
         types_in = list(set(type(v) for v in self.values()))
 
         def match_class(x):
@@ -699,8 +699,11 @@ class Dataset(DictionaryPlus):
                 with open(f"{z[0]+"_"+filename if filename != "./" else z[0]+".csv"}", "w", encoding="utf-8") as output:
                     z[1].to_csv(output, index=False)
             out[z[0]] = z[1]
+        if merged:
+            return pd.concat([out[k] for k in out.keys()]).reset_index()
         return out
 
+
     def save_data(self, directory="./saved/", levels=[]):
         def get_specific_level(v, j):
             if hasattr(v, j):
@@ -837,7 +840,7 @@ class Dataset(DictionaryPlus):
                 if (k in value.m.keys()) and (value.m[k] == v):
                     value.m[k] = None
 
-    def monitor(self,value):
+    def get_monitor(self,value):
         return self.subset({"monitor":[value]})
 
 class Group(pd.DataFrame):
@@ -1397,6 +1400,9 @@ class Summary(pd.DataFrame):
 
         return output
 
+    def get_monitor(self, value):
+        return self.subset({"monitor": [value]})
+
     def plot_app(
         self,
         x=None,
@@ -1775,6 +1781,10 @@ class Upas(Apm):
     def _constructor_sliced(self):
         return UpasSeries
 
+    @property
+    def units(self):
+        return upas_units
+
 class UpasSeries(ApmSeries):
     def __init__(self, *args, **kwargs):
         ApmSeries.__init__(self, *args, **kwargs)
@@ -1801,6 +1811,10 @@ class Lascar(Apm):
     def _constructor_sliced(self):
         return LascarSeries
 
+    @property
+    def units(self):
+        return lascar_units
+
 class LascarSeries(ApmSeries):
     def __init__(self, *args, **kwargs):
         ApmSeries.__init__(self, *args, **kwargs)
@@ -1826,6 +1840,10 @@ class Purple(Apm):
     def _constructor_sliced(self):
         return PurpleSeries
 
+    @property
+    def units(self):
+        return purple_units
+
 class PurpleSeries(ApmSeries):
     def __init__(self, *args, **kwargs):
         ApmSeries.__init__(self, *args, **kwargs)