@@ -972,6 +972,11 @@ def write_vaccination_data(dict_data: dict,
972972 dd .EngEng ['ageRKI' ]]).agg (
973973 {column : "sum" for column in vacc_column_names }).reset_index ()
974974
975+ df_data_agevacc_ger_cs = df_data_agevacc_county_cs .groupby (
976+ [dd .EngEng ['date' ],
977+ dd .EngEng ['ageRKI' ]]).agg (
978+ {column : "sum" for column in vacc_column_names }).reset_index ()
979+
975980 # make plot of absolute numbers original age resolution
976981 if conf_obj .plot :
977982 # extract (dummy) date column to plt
@@ -1020,6 +1025,10 @@ def write_vaccination_data(dict_data: dict,
10201025 dd .EngEng ['idState' ]]).agg (
10211026 {column : "sum" for column in vacc_column_names }).reset_index ()
10221027
1028+ df_data_ger_cs = df_data_county_cs .groupby (
1029+ [dd .EngEng ['date' ]]).agg (
1030+ {column : "sum" for column in vacc_column_names }).reset_index ()
1031+
10231032 ####### age resolved with extrapolation to other age groups #######
10241033 # write data frame resolved per county and age (with age classes as
10251034 # provided in RKI infection tables: 0-4, 5-14, 15-34, 35-59, 60-79, 80+)
@@ -1040,6 +1049,11 @@ def write_vaccination_data(dict_data: dict,
10401049 dd .EngEng ['ageRKI' ]]).agg (
10411050 {column : "sum" for column in vacc_column_names }).reset_index ()
10421051
1052+ df_data_ageinf_ger_cs = df_data_ageinf_county_cs .groupby (
1053+ [dd .EngEng ['date' ],
1054+ dd .EngEng ['ageRKI' ]]).agg (
1055+ {column : "sum" for column in vacc_column_names }).reset_index ()
1056+
10431057 # make plot of relative numbers of original and extrapolated age resolution
10441058 if conf_obj .plot :
10451059 # merge Eisenach...
@@ -1141,6 +1155,12 @@ def write_vaccination_data(dict_data: dict,
11411155 gd .write_dataframe (df_data_agevacc_state_cs ,
11421156 directory , filename , file_format )
11431157
1158+ # store data for germany
1159+ filename = 'vacc_germany_agevacc'
1160+ filename = gd .append_filename (filename , impute_dates , moving_average )
1161+ gd .write_dataframe (df_data_agevacc_ger_cs ,
1162+ directory , filename , file_format )
1163+
11441164 # store data for all counties
11451165 filename = 'vacc_county'
11461166 filename = gd .append_filename (filename , impute_dates , moving_average )
@@ -1152,6 +1172,12 @@ def write_vaccination_data(dict_data: dict,
11521172 filename = gd .append_filename (filename , impute_dates , moving_average )
11531173 gd .write_dataframe (df_data_state_cs , directory , filename , file_format )
11541174
1175+ # store data for germany
1176+ filename = 'vacc_germany'
1177+ filename = gd .append_filename (filename , impute_dates , moving_average )
1178+ gd .write_dataframe (df_data_ger_cs ,
1179+ directory , filename , file_format )
1180+
11551181 ####### age resolved with extrapolation to other age groups #######
11561182 # write data frame resolved per county and age (with age classes as
11571183 # provided in RKI infection tables: 0-4, 5-14, 15-34, 35-59, 60-79, 80+)
@@ -1168,11 +1194,18 @@ def write_vaccination_data(dict_data: dict,
11681194 filename = gd .append_filename (filename , impute_dates , moving_average )
11691195 gd .write_dataframe (df_data_ageinf_state_cs ,
11701196 directory , filename , file_format )
1197+
1198+ # store data for germany
1199+ filename = 'vacc_germany_ageinf'
1200+ filename = gd .append_filename (filename , impute_dates , moving_average )
1201+ gd .write_dataframe (df_data_ageinf_ger_cs ,
1202+ directory , filename , file_format )
1203+
11711204 return None
11721205 else :
1173- return (df_data_agevacc_county_cs , df_data_agevacc_state_cs ,
1174- df_data_county_cs , df_data_state_cs ,
1175- df_data_ageinf_county_cs , df_data_ageinf_state_cs )
1206+ return (df_data_agevacc_county_cs , df_data_agevacc_state_cs , df_data_agevacc_ger_cs ,
1207+ df_data_county_cs , df_data_state_cs , df_data_ger_cs ,
1208+ df_data_ageinf_county_cs , df_data_ageinf_state_cs , df_data_ageinf_ger_cs )
11761209
11771210
11781211def get_vaccination_data (
0 commit comments