converging new DAQ data structure
more DAQ refactoring