Correctly retrieve event name

UCL · Dec 13, 2024 · 84f8263 · 84f8263
1 parent 0e7dc99
commit 84f8263
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/tlo/events.py b/src/tlo/events.py
@@ -97,7 +97,7 @@ def compare_population_dataframe(self,df_before, df_after):
                 # First add event info
                 link_info = {
                     'person_ID': idx,
-                    'event': str(self),
+                    'event': type(self).__name__,
                     'event_date': self.sim.date,
                 }
 
@@ -136,7 +136,7 @@ def store_chains_to_do_before_event(self) -> tuple[bool, pd.Series, pd.DataFrame
                     # TO BE REMOVED This is currently just used for debugging. Will be removed from final version of PR.
                     row = self.sim.population.props.loc[[abs(self.target)]]
                     row['person_ID'] = self.target
-                    row['event'] = str(self)
+                    row['event'] = type(self).__name__
                     row['event_date'] = self.sim.date
                     row['when'] = 'Before'
                     self.sim.event_chains = pd.concat([self.sim.event_chains, row], ignore_index=True)
@@ -164,7 +164,7 @@ def store_chains_to_do_after_event(self, print_chains, row_before, df_before) ->
                 link_info = {
                     #'person_ID' : self.target,
                     'person_ID' : self.target,
-                    'event' : str(self),
+                    'event' : type(self).__name__,
                     'event_date' : self.sim.date,
                 }
                 # Store (if any) property changes as a result of the event for this individual
@@ -179,7 +179,7 @@ def store_chains_to_do_after_event(self, print_chains, row_before, df_before) ->
                     # Print entire row
                     row = self.sim.population.props.loc[[abs(self.target)]] # Use abs to avoid potentil issue with direct births
                     row['person_ID'] = self.target
-                    row['event'] = str(self)
+                    row['event'] = type(self).__name__
                     row['event_date'] = self.sim.date
                     row['when'] = 'After'
                     self.sim.event_chains = pd.concat([self.sim.event_chains, row], ignore_index=True)
@@ -202,13 +202,13 @@ def store_chains_to_do_after_event(self, print_chains, row_before, df_before) ->
                         indices = change.index
                         new_rows_before = df_before.loc[indices]
                         new_rows_before['person_ID'] = new_rows_before.index
-                        new_rows_before['event'] = self
+                        new_rows_before['event'] = type(self).__name__
                         new_rows_before['event_date'] = self.sim.date
                         new_rows_before['when'] = 'Before'
 
                         new_rows_after = df_after.loc[indices]
                         new_rows_after['person_ID'] = new_rows_after.index
-                        new_rows_after['event'] = self
+                        new_rows_after['event'] = type(self).__name__
                         new_rows_after['event_date'] = self.sim.date
                         new_rows_after['when'] = 'After'
 

diff --git a/src/tlo/methods/hsi_event.py b/src/tlo/methods/hsi_event.py
@@ -222,7 +222,7 @@ def store_chains_to_do_before_event(self) -> tuple[bool, pd.Series]:
                     # TO BE REMOVED This is currently just used for debugging. Will be removed from final version of PR.
                     row = self.sim.population.props.loc[[abs(self.target)]]
                     row['person_ID'] = self.target
-                    row['event'] = str(self)
+                    row['event'] = type(self).__name__ #str(self.event_name)
                     row['event_date'] = self.sim.date
                     row['when'] = 'Before'
 
@@ -268,7 +268,7 @@ def store_chains_to_do_after_event(self, print_chains, row_before, footprint) ->
 
             link_info = {
                 'person_ID': self.target,
-                'event' : str(self),
+                'event' : type(self).__name__,
                 'event_date' : self.sim.date,
                 'appt_footprint' : record_footprint,
                 'level' : record_level,
@@ -285,7 +285,7 @@ def store_chains_to_do_after_event(self, print_chains, row_before, footprint) ->
                 # TO BE REMOVED This is currently just used for debugging. Will be removed from final version of PR.
                 row = self.sim.population.props.loc[[abs(self.target)]]
                 row['person_ID'] = self.target
-                row['event'] = str(self)
+                row['event'] = type(self).__name__
                 row['event_date'] = self.sim.date
                 row['when'] = 'After'
                 row['appt_footprint'] = record_footprint