introducing index grid for helper struct holding spacepoint id and track id

diff --git a/HLT/BASE/AliHLTSpacePointContainer.cxx b/HLT/BASE/AliHLTSpacePointContainer.cxx
index bd83663463e3b9e2f1460aca35fe0eb096ac7371..04c417baece0b2f2afb3b5b48397628b128a17ae 100644 (file)
--- a/HLT/BASE/AliHLTSpacePointContainer.cxx
+++ b/HLT/BASE/AliHLTSpacePointContainer.cxx
@@ -439,3 +439,10 @@ ostream& operator<<(ostream &out, const AliHLTSpacePointContainer& c)
   c.Print(out);
   return out;
 }
+
+ostream& operator<<(ostream &out, const AliHLTSpacePointContainer::AliHLTSpacePointProperties& p)
+{
+  // print
+  cout << p.fId;
+  return out;
+}

diff --git a/HLT/BASE/AliHLTSpacePointContainer.h b/HLT/BASE/AliHLTSpacePointContainer.h
index 72f8f7bc2430f91f7912163ff9f8b826ca092d9c..ca0cbaa8bb6ee931ea6cfc2bf3fc3b1b4c588ba6 100644 (file)
--- a/HLT/BASE/AliHLTSpacePointContainer.h
+++ b/HLT/BASE/AliHLTSpacePointContainer.h
@@ -46,6 +46,12 @@ class AliHLTSpacePointContainer : public TObject, public AliHLTLogging
   /// destructor
   ~AliHLTSpacePointContainer();
 
+  struct AliHLTSpacePointProperties {
+    AliHLTSpacePointProperties(AliHLTUInt32_t id=~(AliHLTUInt32_t)0, int trackid=-1) : fId(id), fTrackId(trackid) {}
+    AliHLTUInt32_t fId;      //! the id of the spacepoint
+    int            fTrackId; //! track the spacepoint is assigned to
+  };
+  typedef AliHLTIndexGrid<float, AliHLTSpacePointProperties> AliHLTSpacePointPropertyGrid;
   typedef AliHLTIndexGrid<float, AliHLTUInt32_t> AliHLTSpacePointGrid;
 
   //////////////////////////////////////////////////////////////////////////
@@ -55,8 +61,14 @@ class AliHLTSpacePointContainer : public TObject, public AliHLTLogging
 
   /// add input block to the collection
   virtual int AddInputBlock(const AliHLTComponentBlockData* pDesc)=0;
+  virtual int PopulateAccessGrid(AliHLTSpacePointPropertyGrid* /*pGrid*/, AliHLTUInt32_t /*mask*/) const {return -ENOSYS;}
+  virtual const AliHLTSpacePointPropertyGrid* GetSpacePointPropertyGrid(AliHLTUInt32_t /*mask*/) const {return NULL;}
+  virtual int SetSpacePointPropertyGrid(AliHLTUInt32_t /*mask*/, AliHLTSpacePointPropertyGrid* /*pGrid*/) {return -ENOSYS;}
+
+  // for backward compatibility
   virtual int PopulateAccessGrid(AliHLTSpacePointGrid* /*pGrid*/, AliHLTUInt32_t /*mask*/) const {return -ENOSYS;}
   virtual const AliHLTSpacePointGrid* GetAccessGrid(AliHLTUInt32_t /*mask*/) const {return NULL;}
+  virtual int SetAccessGrid(AliHLTUInt32_t /*mask*/, AliHLTSpacePointGrid* /*pGrid*/) {return -ENOSYS;}
 
   virtual int GetNumberOfSpacePoints() const;
   virtual bool Check(AliHLTUInt32_t clusterID) const;
@@ -158,4 +170,6 @@ class AliHLTSpacePointContainer : public TObject, public AliHLTLogging
 
 ostream& operator<<(ostream &out, const AliHLTSpacePointContainer& c);
 
+ostream& operator<<(ostream &out, const AliHLTSpacePointContainer::AliHLTSpacePointProperties& p);
+
 #endif

diff --git a/HLT/BASE/HLTbaseLinkDef.h b/HLT/BASE/HLTbaseLinkDef.h
index 2c89fc7dda80ca63d79eae9e883efdc45aa998dd..9588e7cbcfa5129c1256b156c1a612d6c29fede7 100644 (file)
--- a/HLT/BASE/HLTbaseLinkDef.h
+++ b/HLT/BASE/HLTbaseLinkDef.h
@@ -107,6 +107,7 @@
 #pragma link C++ class AliHLTTriggerMenuSymbol+;
 #pragma link C++ class AliHLTRunStatistics+;
 #pragma link C++ class AliHLTSpacePointContainer+;
+#pragma link C++ class AliHLTIndexGrid<float, AliHLTSpacePointContainer::AliHLTSpacePointProperties>+;
 #pragma link C++ class AliHLTIndexGrid<float, AliHLTUInt32_t>+;
 #pragma link C++ class AliHLTIndexGrid<int, AliHLTUInt32_t>+;
 #pragma link C++ class AliHLTTrackGeometry+;