PixTestDaq - issue #166 fixed

and tidy up the code.