Dendro

level1/do_dendro_calculation.py

@@ -55,7 +55,12 @@ def dendroCalculation(df, dendro, first_value):
     except KeyError:
         first_usable_dendro_value = first_value
     df[dendro][0] = first_usable_dendro_value
-    df[dendro] = df[dendro].ffill(axis=0)
+
+    # df has the columns: measured values | d_ini | bhd
+    # do the dropna here, cause the dataframe is now separated in the different dendros and mixed with the manual values
+    df = df.dropna(subset=[dendro])
+
+    # from um to mm
     df[dendro] = df[dendro] / 1000
 
     df.insert(0, 'rad', df['dbh'][0] * 10 / 2)
@@ -75,7 +80,7 @@ def dendroInterpolation(df, dendro):
     df_reindexed = df.reindex(pd.date_range(start=df.index.min(), end=df.index.max(), freq='10min'))
     df_reindexed = df_reindexed.interpolate(method='linear')
     df_reindexed_regex = r'[0-9]+'
-    df_reindexed.name = f'bhd_manu_{re.findall(df_reindexed_regex, dendro)[0]} [mm]'
+    df_reindexed.name = f'bhd_manu_{int(re.findall(df_reindexed_regex, dendro)[0]):03d} [mm]'
     return df_reindexed
 
 
@@ -117,7 +122,7 @@ def dendroProcess(data, manflags):
         name = f"{int(key.split('_')[1])}"
 
         # data column
-        temporary_series = pd.concat(temporary, axis=0).rename(f"bhd_auto_{name} [mm]")
+        temporary_series = pd.concat(temporary, axis=0).rename(f"bhd_auto_{int(name):03d} [mm]")
         final.append(temporary_series)
 
         # interpolation column
@@ -126,7 +131,7 @@ def dendroProcess(data, manflags):
         final.append(df_reindexed * 10)
 
         # flags column
-        flags = pd.Series(9, index=temporary_series.index, name=f"bhd_{name}_f")
+        flags = pd.Series(9, index=temporary_series.index, name=f"bhd_{int(name):03d}_f")
         final.append(flags)
 
     final_df = pd.concat(final, axis=1)