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
These have been introduced with https://github.com/cms-sw/cmssw/commit/2ebe99f5c10d2b0ba7cf601cca3918a8a7c3f350 , which is only in 62XSLHC.