Bug fix to avoid duplicated clusters on the same track in upgraded FPIX

This pull request includes a bug fix and a few changes in an analysis package