message: more improvements to cluster ordering after merging
diff: @@ -649,12 +649,12 @@ struct clcomparestruct {int i; float x; float z; float q;};
  struct AliHLTTPCGMMerger_CompareClusterIds
  {
  - float fQPt, fZ;
  - AliHLTTPCGMMerger_CompareClusterIds(float q, float z) : fQPt(q), fZ(z) {}
  + float fQPt, fDzDs, fThresh;
  + AliHLTTPCGMMerger_CompareClusterIds(float q, float z) : fQPt(q), fDzDs(z), fThresh(fabs(0.1f * 3.14f * 666.f * z / q)) {if (fThresh < 1.) fThresh = 1.; if (fThresh > 4.) fThresh = 4.;}
  bool operator()(const clcomparestruct& a, const clcomparestruct& b) { //a < b ?
  - if (a.q * b.q < 0) return((a.z - b.z) * fZ > 0);
  - int dz = a.z - b.z;
  - if (fabs(dz) > 4) return((a.z - b.z) * fZ > 0);
  + if (a.q * b.q < 0) return((a.z - b.z) * fDzDs > 0);
  + float dz = a.z - b.z;
  + if (fabs(dz) > fThresh) return((a.z - b.z) * fDzDs > 0);
  return((a.x - b.x) * a.q * fQPt > 0);
  }
  };
  @@ -745,7 +745,6 @@ void AliHLTTPCGMMerger::CollectMergedTracks()
  clA[nHits++] = alpha;
  }
  }
  -
  if ( nHits < TRACKLET_SELECTOR_MIN_HITS(track.QPt()) ) continue;
  int ordered = 1;
  @@ -763,7 +762,7 @@ void AliHLTTPCGMMerger::CollectMergedTracks()
  {
  int nTmpHits = 0;
  - //Find sign(Pt) for the segment closest to the vertex, if low/mid Pt
  + //Find QPt and DzDs for the segment closest to the vertex, if low/mid Pt
  float baseQPt = 1.f;
  float baseZ = 1.0;
  if (fabs(trackParts[0]->QPt()) > 2)
  