message: fix a bug that could lead to duplicated clusters in a rare case, clean up totally messed up indentation, duplicated cluster still not fully fixed
diff: @@ -394,8 +394,7 @@ void AliHLTTPCGMMerger::MakeBorderTracks( int iSlice, int iBorder, AliHLTTPCGMBo
  }
  -void AliHLTTPCGMMerger::MergeBorderTracks ( int iSlice1, AliHLTTPCGMBorderTrack B1[], int N1,
  - int iSlice2, AliHLTTPCGMBorderTrack B2[], int N2 )
  +void AliHLTTPCGMMerger::MergeBorderTracks ( int iSlice1, AliHLTTPCGMBorderTrack B1[], int N1, int iSlice2, AliHLTTPCGMBorderTrack B2[], int N2 )
  {
  //* merge two sets of tracks
  if (N1 == 0 || N2 == 0) return;
  @@ -608,15 +607,6 @@ struct AliHLTTPCGMMerger_CompareClusterIds
  void AliHLTTPCGMMerger::CollectMergedTracks()
  {
  - //*
  -
  - //for ( int iSlice = 0; iSlice < fgkNSlices; iSlice++ ) {
  - //for ( int itr = 0; itr < fSliceNTrackInfos[iSlice]; itr++ ) {
  - //AliHLTTPCGMSliceTrack &track = fSliceTrackInfos[ fSliceTrackInfoStart[iSlice] + itr ];
  - //if( track.Used()!=2 ) track.SetUsed(0);
  - //}
  - //}
  -
  //Resolve connections for global tracks first
  for (int iSlice = 0;iSlice < fgkNSlices;iSlice++)
  {
  @@ -676,7 +666,8 @@ void AliHLTTPCGMMerger::CollectMergedTracks()
  AliHLTTPCCASliceOutCluster trackClusters[kMaxClusters];
  uchar2 clA[kMaxClusters];
  int nHits = 0;
  - for( int ipart=0; ipart<nParts; ipart++ ){
  + for( int ipart=0; ipart<nParts; ipart++ )
  + {
  const AliHLTTPCGMSliceTrack *t = trackParts[ipart];
  if (DEBUG) printf("Collect Track %d Part %d QPt %f DzDs %f\n", fNOutputTracks, ipart, t->QPt(), t->DzDs());
  int nTrackHits = t->NClusters();
  @@ -695,7 +686,7 @@ void AliHLTTPCGMMerger::CollectMergedTracks()
  int ordered = 1;
  for( int i=1; i<nHits; i++ )
  {
  - if ( trackClusters[i].GetX() > trackClusters[i-1].GetX() )
  + if ( trackClusters[i].GetX() > trackClusters[i-1].GetX() || trackClusters[i].GetId() == trackClusters[i - 1].GetId())
  {
  ordered = 0;
  break;
  