fameio 1.8__py3-none-any.whl → 1.8.2__py3-none-any.whl

fameio/source/cli.py

@@ -237,7 +237,7 @@ def add_steps_after_argument(parser: argparse.ArgumentParser) -> None:
 def get_merging_args(args: argparse.Namespace) -> Dict[MergingOptions, int]:
     """Returns a dictionary of GroupingOptions with their values if `time_merging` entry exists"""
     merging_args = {}
-    if "time_merging" in args:
+    if vars(args).get("time_merging"):
         merging_args[MergingOptions.FOCAL_POINT] = args.focal_point
         merging_args[MergingOptions.STEPS_BEFORE] = args.steps_before
         merging_args[MergingOptions.STEPS_AFTER] = args.steps_after

fameio/source/results/conversion.py

@@ -37,7 +37,7 @@ def apply_time_merging(data: Dict[Optional[str], pd.DataFrame], config: Optional
             index_columns = df.index.names
             df.reset_index(inplace=True)
             df["TimeStep"] = df["TimeStep"].apply(lambda t: merge_time(t, first_positive_focal_point, offset, period))
-            data[key] = df.groupby(by=index_columns, axis=0).sum()
+            data[key] = df.groupby(by=index_columns).sum()
 
 
 def merge_time(time_step: int, focal_time: int, offset: int, period: int) -> int: