enable extra tour mc logsum cols in tour od choice spec

Author: mxndrwgrdnr

activitysim/abm/models/tour_od_choice.py

@@ -107,8 +107,11 @@ def tour_od_choice(
         estimator.write_override_choices(choices_df.choice)
         estimator.end_estimation()
 
-    tours[origin_col_name] = choices_df[origin_col_name]
-    tours[dest_col_name] = choices_df[dest_col_name]
+    tours[origin_col_name] = choices_df[origin_col_name].reindex(tours.index)
+    tours[dest_col_name] = choices_df[dest_col_name].reindex(tours.index)
+    if want_logsums:
+        tours[logsum_column_name] = \
+            choices_df['logsum'].reindex(tours.index).astype('float')
     tours['poe_id'] = tours[origin_col_name].map(land_use.to_frame(columns='poe_id').poe_id)
 
     households = households.to_frame()

activitysim/abm/models/util/tour_od.py

@@ -752,6 +752,10 @@ def run_od_logsums(
         pipeline.get_rn_generator().drop_channel('trips')
         tracing.deregister_traceable_table('trips')
 
+        assert (od_sample.index == choosers.index).all()
+        for col in new_cols:
+            od_sample[col] = choosers[col]
+
     logsums = logsum.compute_logsums(
         choosers,
         spec_segment_name,
@@ -762,6 +766,7 @@ def run_od_logsums(
         chunk_tag,
         trace_label, 'end', 'start', 'duration')
 
+    assert (od_sample.index == logsums.index).all()
     od_sample['tour_mode_choice_logsum'] = logsums
 
     return od_sample