avoca 0.11.1__py3-none-any.whl → 0.11.2__py3-none-any.whl

avoca/bindings/ebas.py

@@ -17,7 +17,7 @@ from ebas.io.file.nasa_ames import EbasNasaAmes
 from nilutility.datatypes import DataObject
 from nilutility.datetime_helper import DatetimeInterval
 
-from avoca.bindings.ebas_flags import ebas_flag_to_avoca, flags_to_ebas
+from avoca.bindings.ebas_flags import ebas_flag_to_avoca, flags_to_ebas, nan_flags
 from avoca.flags import QA_Flag
 
 logger = logging.getLogger(__name__)
@@ -136,17 +136,18 @@ def set_dataframe(
         dict_flags_to_ebas[QA_Flag.CALIBRATION] = 980
 
     for sub in compounds:
+        flag_col = df_export[(sub, "flag")]
         flags = [
             sorted(
                 flag_all
                 + [dict_flags_to_ebas[f] for f in QA_Flag if f in QA_Flag(flag)]
             )
-            for flag in df_export[(sub, "flag")]
+            for flag in flag_col
         ]
-        nan_flag = df_export[(sub, "flag")] & QA_Flag.MISSING.value
+        nan_flag = np.logical_or.reduce([flag_col & flag.value for flag in nan_flags])
         if data_level == DataLevel.CONCS:
             # Invalidate also the calibration runs
-            nan_flag |= df_export[(sub, "flag")] & QA_Flag.CALIBRATION.value
+            nan_flag |= flag_col & QA_Flag.CALIBRATION.value
 
         for var in vars_to_export[data_level]:
             ebas_name = compounds[sub]

avoca/bindings/ebas_flags.py

@@ -40,6 +40,14 @@ if missing_flags:
         f"Not all QA flags are mapped to Ebas flags. Missing: {missing_flags}"
     )
 
+# Flags that are considered to have missing values
+nan_flags = [
+    QA_Flag.MISSING,
+    QA_Flag.ZERO_NEG_CONC_EXT,
+    QA_Flag.INVALIDATED_EXT,
+    QA_Flag.INVALID_VALUES,
+]
+
 # priority of the flag to appear in the output
 # Useful when you can select only one flag value
 flag_order = [

{avoca-0.11.1.dist-info → avoca-0.11.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avoca
-Version: 0.11.1
+Version: 0.11.2
 Summary: @voc@: Quality assessement of measurement data
 Project-URL: Homepage, https://gitlab.com/empa503/atmospheric-measurements/avoca
 Project-URL: Bug Tracker, https://gitlab.com/empa503/atmospheric-measurements/avoca/-/issues

{avoca-0.11.1.dist-info → avoca-0.11.2.dist-info}/RECORD

@@ -8,8 +8,8 @@ avoca/manager.py,sha256=ET-ATrSLi2rSV7PjBzwpjj0V_60MFxSIZqQ03aEIbdA,5284
 avoca/requirements.py,sha256=q4z6bJ6iW5jSy10Y0elfE9BoEcAZC2-kUqYi4zA6TGE,563
 avoca/settings.py,sha256=Px-sCGIlRyWI2RBJaGUY0K1V60kOZY9n41eft92bjN4,2112
 avoca/bindings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-avoca/bindings/ebas.py,sha256=DeIRhHbxj76TMy3Z_Ok2AgiGzSkb6pW7scIMORgh3y0,17243
-avoca/bindings/ebas_flags.py,sha256=ls8cEKPC2QjlkWyqiytyjFfemqM8ot8suys_Qi5Xx1o,2352
+avoca/bindings/ebas.py,sha256=s9274kwymZs0EO-2UMEUHV1iLgbWv7YR_r2e-O5m0SI,17286
+avoca/bindings/ebas_flags.py,sha256=uzPrd45OoULycCRYWCwHQG1exUDoWSe8JmULOAsEHRs,2537
 avoca/bindings/gcwerks-report.conf,sha256=jO0I62DfgzrXXS1FuiW8ds-oc1_j8kpFCO61Fk-erBw,230
 avoca/bindings/gcwerks.py,sha256=pTwZhSuoD4usER1-JhQJtgj1KUcZR1ZN1loZMCSd3TQ,14651
 avoca/bindings/gcwerks_gui.py,sha256=Fj3p8obFq3lWrWW0LlA8WBALP8-U70hvps5vZEt4NaM,9458
@@ -29,7 +29,7 @@ avoca/testing/df.py,sha256=Nc0GUYTApZgYyUTMnHMTbSKLiA5ty9Bg7gUGtnoFYMI,1826
 avoca/utils/__init__.py,sha256=LEA2jJsqwSK2DBzXg00DbPhM1fXXREJ0XxLeuJtKapY,1398
 avoca/utils/flags_doc.py,sha256=cS7yKpxVh_SA6EdH3lSy9UpcIvhGwzAELRbkXN3CxO8,4168
 avoca/utils/torch_models.py,sha256=53TgOgSPMOOSGYy2cm1EGSK7qQkYMGEOq319KKM_Ir0,1015
-avoca-0.11.1.dist-info/METADATA,sha256=F6Au_DcqiIbQFSIGBDpqUt76yHMsZF0MX6doqEYPpxA,1570
-avoca-0.11.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-avoca-0.11.1.dist-info/licenses/LICENCE.txt,sha256=4MY53j3v7tEKwjyuriVz9YjB4Dscm2nDMB2CcG9lOmk,1059
-avoca-0.11.1.dist-info/RECORD,,
+avoca-0.11.2.dist-info/METADATA,sha256=K4hT3SyF9sIKVliTugVpFgLDwYjalRsWx6Wb6qU_2eE,1570
+avoca-0.11.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+avoca-0.11.2.dist-info/licenses/LICENCE.txt,sha256=4MY53j3v7tEKwjyuriVz9YjB4Dscm2nDMB2CcG9lOmk,1059
+avoca-0.11.2.dist-info/RECORD,,