Sum by loss type instead of by aggby

Author: ptormene

openquake/calculators/extract.py

@@ -898,8 +898,8 @@ def extract_aggrisk_tags(dstore, what):
                 for qfield, qvalue in zip(qfields, qvalues):
                     acc[qfield].append(qvalue)
     df = pandas.DataFrame(acc)
-    total_df = df.groupby(aggby, as_index=False).sum()
-    total_df['loss_type'] = 'total'
+    total_df = df.groupby('loss_type', as_index=False).sum()
+    total_df[aggby] = 'total'
     df = pandas.concat([df, total_df], ignore_index=True)
 
     return df

openquake/qa_tests_data/event_based_risk/case_1/expected/aggrisk_tags.csv

@@ -7,7 +7,5 @@ B,RM,nonstructural,2.50000E+03,9.44013E+01
 B,RM,structural,5.00000E+03,3.55602E+02
 B,W,nonstructural,5.00000E+02,2.60544E+01
 B,W,structural,1.00000E+03,2.52457E+02
-A,RC,total,3.00000E+03,8.89886E+01
-A,RM,total,4.50000E+03,1.64871E+02
-B,RM,total,7.50000E+03,4.50003E+02
-B,W,total,1.50000E+03,2.78511E+02
+total,total,nonstructural,5.50000E+03,1.69074E+02
+total,total,structural,1.10000E+04,8.13301E+02