diff --git a/pyaerocom/data/ebas_config.ini b/pyaerocom/data/ebas_config.ini index 5d70d5528..8dbf69c8f 100644 --- a/pyaerocom/data/ebas_config.ini +++ b/pyaerocom/data/ebas_config.ini @@ -178,6 +178,7 @@ matrix=aerosol,pm10,pm25 component=elemental_carbon instrument=denuder,ecoc_monitor,filter_1pack,filter_2pack,high_vol_sampler,impactor,low_vol_sampler,lvs_denuder_single,lvs_denuder_tandem,lvs_QBQ,lvs_single,lvs_single_twin,lvs_teflon matrix=pm25,pm10,pm1,aerosol +statistics=arithmetic mean,median [conceqbc] component=equivalent_black_carbon @@ -188,35 +189,42 @@ matrix=aerosol,pm1,pm10,pm25 component=elemental_carbon # after discussion with Wenche matrix=pm25,pm10,aerosol,pm1 +statistics=arithmetic mean,median [concCecpm25] component=elemental_carbon matrix=pm25,pm1 +statistics=arithmetic mean,median [conctc] component=total_carbon # after discussion with Wenche matrix=pm25,pm10,aerosol +statistics=arithmetic mean,median [concoa] component=organic_carbon # after discussion with Wenche matrix=pm25,pm10,aerosol,pm1 scale_factor=1.4 +statistics=arithmetic mean,median [concoc] component=organic_carbon # after discussion with Wenche matrix=pm25,pm10,aerosol,pm1 +statistics=arithmetic mean,median [concCoc] component=organic_carbon # after discussion with Wenche matrix=pm25,pm10,aerosol,pm1 +statistics=arithmetic mean,median [concCocpm25] component=organic_carbon matrix=pm25,pm1 +statistics=arithmetic mean,median [concss] component=sodium @@ -432,10 +440,12 @@ matrix=precip [concCocpm10] component=organic_carbon matrix=pm10 +statistics=arithmetic mean,median [concCecpm10] component=elemental_carbon matrix=pm10 +statistics=arithmetic mean,median # CAMS2_40 Task4041 @@ -466,6 +476,7 @@ matrix=air [concCoc25] component=organic_carbon matrix=pm25,pm1 +statistics=arithmetic mean,median [concom25] component=organic_mass diff --git a/tests/io/test_ebas_varinfo.py b/tests/io/test_ebas_varinfo.py index be337d688..ae1368fa9 100644 --- a/tests/io/test_ebas_varinfo.py +++ b/tests/io/test_ebas_varinfo.py @@ -66,7 +66,15 @@ None, 1.0, ), - ("ac550dryaer", None, None, ["filter_absorption_photometer"], None, ["ac550aer", "acrh"], 1), + ( + "ac550dryaer", + None, + None, + ["filter_absorption_photometer"], + None, + ["ac550aer", "acrh"], + 1, + ), ( "ac550lt1aer", ["aerosol_absorption_coefficient"], @@ -115,8 +123,24 @@ ("concso2", ["sulphur_dioxide"], ["air"], None, None, None, 1.0), ("concpm10", ["pm10_mass"], ["pm10"], None, None, None, 1.0), ("concpm25", ["pm25_mass"], ["pm25"], None, None, None, 1.0), - ("concso4t", ["sulphate_total"], ["aerosol", "pm10", "pm25"], None, None, None, 1.0), - ("concso4c", ["sulphate_corrected"], ["aerosol", "pm10", "pm25"], None, None, None, 1.0), + ( + "concso4t", + ["sulphate_total"], + ["aerosol", "pm10", "pm25"], + None, + None, + None, + 1.0, + ), + ( + "concso4c", + ["sulphate_corrected"], + ["aerosol", "pm10", "pm25"], + None, + None, + None, + 1.0, + ), ( "concbc", ["elemental_carbon"], @@ -136,7 +160,7 @@ "lvs_single_twin", "lvs_teflon", ], - None, + ["arithmetic mean", "median"], None, 1.0, ), @@ -149,19 +173,67 @@ None, 1, ), - ("conctc", ["total_carbon"], ["pm25", "pm10", "aerosol"], None, None, None, 1.0), - ("concoa", ["organic_carbon"], ["pm25", "pm10", "aerosol", "pm1"], None, None, None, 1.4), - ("concoc", ["organic_carbon"], ["pm25", "pm10", "aerosol", "pm1"], None, None, None, 1), - ("concss", ["sodium"], ["pm10", "aerosol", "pm25", "pm1", "air"], None, None, None, 3.27), + ( + "conctc", + ["total_carbon"], + ["pm25", "pm10", "aerosol"], + None, + ["arithmetic mean", "median"], + None, + 1.0, + ), + ( + "concoa", + ["organic_carbon"], + ["pm25", "pm10", "aerosol", "pm1"], + None, + ["arithmetic mean", "median"], + None, + 1.4, + ), + ( + "concoc", + ["organic_carbon"], + ["pm25", "pm10", "aerosol", "pm1"], + None, + ["arithmetic mean", "median"], + None, + 1, + ), + ( + "concss", + ["sodium"], + ["pm10", "aerosol", "pm25", "pm1", "air"], + None, + None, + None, + 3.27, + ), ("concnh3", ["ammonia"], ["air"], None, None, None, 1.0), ("concno3", ["nitrate"], ["pm10", "aerosol", "pm25"], None, None, None, 1.0), ("concnh4", ["ammonium"], ["pm10", "aerosol", "pm25"], None, None, None, 1.0), ("concNhno3", ["nitric_acid"], ["air"], None, None, None, 1.0), - ("concNtno3", ["sum_nitric_acid_and_nitrate"], ["air+aerosol"], None, None, None, 1.0), + ( + "concNtno3", + ["sum_nitric_acid_and_nitrate"], + ["air+aerosol"], + None, + None, + None, + 1.0, + ), ("concno2", ["nitrogen_dioxide"], ["air"], None, None, None, 1.0), ("conco3", ["ozone"], ["air"], None, None, None, 1), ("concco", ["carbon_monoxide"], ["air"], None, None, None, 1.0), - ("concprcpoxs", ["sulphate_corrected", "sulphate_total"], ["precip"], None, None, None, 1.0), + ( + "concprcpoxs", + ["sulphate_corrected", "sulphate_total"], + ["precip"], + None, + None, + None, + 1.0, + ), ("concprcpoxn", ["nitrate"], ["precip"], None, None, None, 1.0), ("concprcprdn", ["ammonium"], ["precip"], None, None, None, 1.0), ("wetoxs", None, None, None, None, ["concprcpoxs"], 1), @@ -221,6 +293,7 @@ def test_varinfo( assert info.component == component assert info.matrix == matrix assert info.instrument == instrument + print(info.statistics, statistics, info.statistics == statistics) assert info.statistics == statistics assert info.requires == requires assert info.scale_factor == scale_factor