Revert "remove end trigs for better correlation"

This reverts commit 486bf1a311eb460225bb90d2324db16b94720b79.
Tweak to xcorr alignment

Also added reset Vincent's end trigger removal modification.