From 7b05a853825c6409305121d7acad2486483edec9 Mon Sep 17 00:00:00 2001 From: AdamTheisen Date: Thu, 29 Feb 2024 19:13:19 +0000 Subject: [PATCH] ENH: Updates --- afc_summary.py | 2 ++ conf/epc_aos.py | 34 ---------------------------------- conf/kcg_conf.py | 2 +- conf/test_conf.py | 12 ++++++------ images/kcg/kcg_data_avail.pdf | Bin 63041 -> 63602 bytes 5 files changed, 9 insertions(+), 41 deletions(-) delete mode 100644 conf/epc_aos.py diff --git a/afc_summary.py b/afc_summary.py index 0b3374e..7304da4 100644 --- a/afc_summary.py +++ b/afc_summary.py @@ -129,10 +129,12 @@ def get_da(site, dsname, dsname2, data_path, t_delta, d, dqr, c_start, c_end): files = glob.glob('/'.join([data_path, site, ds, ds + '*' + d + '*nc'])) if len(files) == 0: files = glob.glob('/'.join([data_path, site, ds, ds + '*' + d + '*cdf'])) + files = sorted(files) # Set time delta to 1 minute if not specified if t_delta is None: t_delta = 1 + # Read data for primary datastream if len(files) > 0: try: diff --git a/conf/epc_aos.py b/conf/epc_aos.py deleted file mode 100644 index 3493540..0000000 --- a/conf/epc_aos.py +++ /dev/null @@ -1,34 +0,0 @@ -# dsname: Datastream name to pull data from -# dsname2: Secondary datastream(s) to include and merge -# t_delta: Script will resample data to 1 min. If gaps are longer set this appropriately -# workers: Set to 1 in the case of radar data so it doesn't crash the system -conf = { - 'site': 'epc', - 'facility': 'M1', - 'start_date': '2023-02-15', - 'end_date': '2024-02-14', - 'outname': '/home/theisen/Code/AFC_Summary/images/epc/epc_aos_data_avail.pdf', #options are png, pdf, etc - 'chart_style': 'linear', - 'info_style': 'simple', - 'data_path': '/data/archive', - 'dqr_table': True, - 'doi_table': True, #this will remove the DOI from besides the plots - 'instruments':{ - 'acsm': {'dsname': 'aosacsmM1.b1', 't_delta': 30}, - 'aeth': {'dsname': 'aosaeth2spotM1.a1'}, - 'aosmet': {'dsname': 'aosmetM1.a1'}, - 'ccn': {'dsname': 'aosccn2colaM1.b1'}, - 'co-analyzer': {'dsname': 'aoscoM1.b1'}, - 'cpc': {'dsname': 'aoscpcf1mM1.b1'}, - 'cpc': {'dsname': 'aoscpcu1mM1.b1'}, - 'htdma': {'dsname': 'aoshtdmaM1.a1', 't_delta': 11}, - 'nephelometer': {'dsname': 'aosnephdry1mM1.b1'}, - 'nephelometer': {'dsname': 'aosnephwet1mM1.b1'}, - 'ozone': {'dsname': 'aoso3M1.b1'}, - 'psap': {'dsname': 'aospsap3w1mM1.b1'}, - 'smps': {'dsname': 'aossmpsM1.b1', 't_delta': 30}, - 'so2': {'dsname': 'aosso2M1.b1'}, - 'sp2': {'dsname': 'aossp2bc60sM1.b1'}, - 'uhsas': {'dsname': 'aosuhsasM1.b1'}, - } -} diff --git a/conf/kcg_conf.py b/conf/kcg_conf.py index ec8cae5..880f7d8 100644 --- a/conf/kcg_conf.py +++ b/conf/kcg_conf.py @@ -10,7 +10,7 @@ 'outname': '/home/theisen/Code/AFC_Summary/images/kcg/kcg_data_avail.pdf', #options are png, pdf, etc 'chart_style': 'linear', 'info_style': 'simple', - 'data_path': '/data/archive', + 'data_path': '/data/datastream', 'dqr_table': True, 'doi_table': True, #this will remove the DOI from besides the plots 'instruments':{ diff --git a/conf/test_conf.py b/conf/test_conf.py index 9ad9374..a7f3bbf 100644 --- a/conf/test_conf.py +++ b/conf/test_conf.py @@ -3,18 +3,18 @@ # t_delta: Script will resample data to 1 min. If gaps are longer set this appropriately # workers: Set to 1 in the case of radar data so it doesn't crash the system conf = { - 'site': 'epc', + 'site': 'kcg', 'facility': 'M1', - 'start_date': '2023-02-15', - 'end_date': '2024-02-14', - 'outname': '/home/theisen/Code/AFC_Summary/images/epc/epc_data_avail.pdf', #options are png, pdf, etc + 'start_date': '2024-02-21', + 'end_date': '2025-06-14', + 'outname': '/home/theisen/Code/AFC_Summary/images/kcg/kcg_data_avail.pdf', #options are png, pdf, etc 'chart_style': 'linear', 'info_style': 'simple', 'data_path': '/data/archive', 'dqr_table': True, 'doi_table': True, #this will remove the DOI from besides the plots 'instruments':{ - 'ecor': {'dsname': '30ecorM1.b1', 't_delta': 30}, - 'met': {'dsname': 'metM1.b1'}, + 'ceil': {'dsname': 'ceilM1.b1'}, + 'irt': {'dsname': 'irtsstM1.b1'}, } } diff --git a/images/kcg/kcg_data_avail.pdf b/images/kcg/kcg_data_avail.pdf index 566b6cd49f8c5c5ce12fc569ac34b55c29cdd34b..3081358995856d0a7f4c6970601c9ac9e8078cb3 100644 GIT binary patch delta 3368 zcmd5+e@s(4UrUBDShW&&CB<-*`}>_{yBU1e((D{ z@AJH`_oD6cC0p&ArEINNvl7VWG|sUg7P~pgI0Ir1riKmh(xQ)_9`;bHZE{z_S0f8; z-dQt0%#Pc#x5;&)WPikCE!x@TEgi)}w)nzY4o7|YC@>Nc3UL_}% z7E_QKX7f(8&QG&WK486`y!4*aiAkkXPh4#B@3?PvY)`qX<8a;O7E)Y(3axr=>Rn=V zgV6Ah@nmsE$4o|fVO47i(%6RW3G7;Blob$-M3b z6@|SMmpWFB9^E>q@awB|%I41B3YuU`_m-`_zKUxvU7XRrKfHUcdc^M z%DpoeHSO?DD0XgeZn}Hl@Q_k%zOlm=KTuWbY_ny259H$D4z|~?^V?ht-#f@$N8?#+tKF&r&;6~?8e|4Q2($CwaAxK;-@0OH_5MR6=~*aJUE(Fqk}KvTJ)`{${IN_i0LQayyQ zD!#=q_|^z*OjHQPL<*2D#xxVI07la=5@R~0VjfnA7Fv(({P{%#A@M1OM3-WSU_Q`( zGr*VtksBsRmtvF`6yIuUu&>AXr7FrGSWJLA(M0@6QFIXmQZSJ7Fq8ySbR>xbAPMC4 z69Pa@WPkvly1)RbDv%tYs!)^i2$mW{-Z>W?3HBo2`fD-BwQ$Vb8 z-w9K|Pi4xQ#)X%iTgO`J`xt1c;!Nmlsy~bLKYP+#R0}-z=V2X`N-+w%z+PoQcBO zTSsQaP11(DAJ^L4z};d}+DP~6UTxt_zP)(tV6ceMKUnHvY@)}Z2hS?q`A00J-0-9J zlyRHxoN`x&GHKuc&d}$yc*17PTs^1ZM1Req${Ra>)oiYOx4p4t_HfH@tzJw`_B@t9 z_r2_%7@1twl^>kFVsUPbOXat&%r)j3Pd?n)*?oO)u5m%s(0(D)+}d=wv!i*}!T2wp zK`=he1kJyoaH;;GLiN+yYCqg^w_~KK_jI*;K2qnlygxpVO_wlR$iJ59IHy8z?v{@3 zit}=BN_jGoci`>OSk2{b$!M|HxzReuJ{_Bfe{;0!`0{aB#^GE$BlstTg)pn!Ve`vV6G(r5gf<{2(H3Oy>NyA zOU9C$;_*Ej$pmp*0uVCNAaPq7LkNPfgbZj-6a*bf!VozUGKgd^0MQbHeg_B{1%jxh z07?X-#06A_ULq|tnM4aqRM46e(#D${+G#kJ5sdW*gVZ}?4Ux+-M%1!Et+Vz&d6uZ) zFC|1F2r{igS$)hTmnPmB6pW~V!q`v+^ovd~q?}eE`uqN&)S47aZAmc*aw8BF*%==z zy>*G_%D)@Iet7*6Q4(MuB*5r(4g5p}#CIPf@1!?ag-eLq%e66VsAa&=6ZFCmOAJ?p Vv=K_V?9}=UaFeO8U$bFt<_|iS>oWiV