ALIROOT-5420 Missing include

[u/mrichter/AliRoot.git] / HLT / BASE / AliHLTTrackGeometry.cxx

diff --git a/HLT/BASE/AliHLTTrackGeometry.cxx b/HLT/BASE/AliHLTTrackGeometry.cxx
index 459e8d8d4845b0761d6fbb7f47fd3ab0c090bef6..dc899c17c9837c1f295b6f63b5600d7d63001f98 100644 (file)
--- a/HLT/BASE/AliHLTTrackGeometry.cxx
+++ b/HLT/BASE/AliHLTTrackGeometry.cxx
@@ -195,14 +195,12 @@ void AliHLTTrackGeometry::Draw(Option_t *option)
   }
 }
 
-int AliHLTTrackGeometry::SetAssociatedSpacePoint(UInt_t planeId, UInt_t spacepointId, int status, float fdU, float fdV)
+int AliHLTTrackGeometry::SetAssociatedSpacePoint(UInt_t planeId, UInt_t spacepointId, int /*status*/, float dU, float dV)
 {
   /// set the spacepoint associated with a track point
   vector<AliHLTTrackPoint>::iterator element = find(fTrackPoints.begin(), fTrackPoints.end(), planeId);
   if (element==fTrackPoints.end()) return -ENOENT;
-  element->SetAssociatedSpacePoint(spacepointId, status);
-  element->SetResidual(0, fdU);
-  element->SetResidual(1, fdV);
+  element->AddAssociatedSpacePoint(spacepointId, dU, dV);
   return 0;
 }
 
@@ -213,7 +211,20 @@ int AliHLTTrackGeometry::GetAssociatedSpacePoint(UInt_t planeId, UInt_t& spacepo
   vector<AliHLTTrackPoint>::const_iterator element = find(fTrackPoints.begin(), fTrackPoints.end(), planeId);
   if (element==fTrackPoints.end()) return -ENOENT;
   if (!element->HaveAssociatedSpacePoint()) return -ENODATA;
-  return element->GetAssociatedSpacePoint(spacepointId);
+  spacepointId=(element->GetSpacepoints())[0].fId;
+  return 0;
+}
+
+int AliHLTTrackGeometry::RegisterTrackPoints(AliHLTTrackGrid* /*pGrid*/) const
+{
+  /// default implementation, nothing to do
+  return -ENOSYS;
+}
+
+int AliHLTTrackGeometry::FillTrackPoints(AliHLTTrackGrid* /*pGrid*/) const
+{
+  /// default implementation, nothing to do
+  return -ENOSYS;
 }
 
 const AliHLTTrackGeometry::AliHLTTrackPoint* AliHLTTrackGeometry::GetTrackPoint(AliHLTUInt32_t id) const
@@ -267,7 +278,7 @@ int AliHLTTrackGeometry::AssociateSpacePoints(const AliHLTUInt32_t* trackpoints,
     AliHLTUInt32_t planeId=0;
     int result=FindMatchingTrackPoint(trackpoints[i], xyz, planeId);
     if (result<0) {
-      HLTWarning("no associated track point found for space point id %08x x=%f y=%f z=%f", trackpoints[i], xyz[0], xyz[1], xyz[2]);
+      if (GetVerbosity()>0) HLTWarning("no associated track point found for space point id %08x x=%f y=%f z=%f", trackpoints[i], xyz[0], xyz[1], xyz[2]);
       continue;
     } else if (result==0) {
       HLTWarning("associated track point for space pointid %08x x=%f y=%f z=%f occupied", trackpoints[i], xyz[0], xyz[1], xyz[2]);
@@ -331,7 +342,11 @@ int AliHLTTrackGeometry::FillResidual(int coordinate, TH2* histo) const
   const vector<AliHLTTrackPoint>& trackPoints=TrackPoints();
   for (vector<AliHLTTrackPoint>::const_iterator trackpoint=trackPoints.begin();
        trackpoint!=trackPoints.end(); trackpoint++) {
-    histo->Fill(GetPlaneR(trackpoint->GetId()), trackpoint->GetResidual(coordinate));
+    if (!trackpoint->HaveAssociatedSpacePoint()) continue;
+    for (vector<AliHLTTrackSpacepoint>::const_iterator sp=(trackpoint->GetSpacepoints()).begin();
+        sp!=(trackpoint->GetSpacepoints()).end(); sp++) {
+      histo->Fill(GetPlaneR(trackpoint->GetId()), sp->GetResidual(coordinate));
+    }
   }
   return 0;
 }