Next set of adjustments to speak the new data-model

@kentquirk These are the set of adjustments to make in-d-gestion generate "good" data for the new data model.  I've done a visual inspection of Jana's most recent branch of tideline on both Howard's data and sample data #1 and I no longer see any artifacts caused by bugs.

There are some artifacts caused by having two devices operating at the same time, but that's expected to have artifacts.