--- trunk/src/selection/DistanceFinder.hpp	2013/06/16 15:15:42	1879
+++ trunk/src/selection/DistanceFinder.hpp	2015/01/09 19:06:35	2052
@@ -42,20 +42,29 @@
 #ifndef SELECTION_DISTANCEFINDER_HPP
 #define SELECTION_DISTANCEFINDER_HPP
 #include "brains/SimInfo.hpp"
-#include "utils/OpenMDBitSet.hpp"
+#include "selection/SelectionSet.hpp"
 #include "primitives/StuntDouble.hpp"
+#include "primitives/Bond.hpp"
+#include "primitives/Bend.hpp"
+#include "primitives/Torsion.hpp"
+#include "primitives/Inversion.hpp"
 namespace OpenMD {
 
   class DistanceFinder {
   public:
     DistanceFinder(SimInfo* si);
 
-    OpenMDBitSet find(const OpenMDBitSet& bs, RealType distance);
-    OpenMDBitSet find(const OpenMDBitSet& bs, RealType distance, int frame);
+    SelectionSet find(const SelectionSet& bs, RealType distance);
+    SelectionSet find(const SelectionSet& bs, RealType distance, int frame);
 
     SimInfo* info_;
     std::vector<StuntDouble*> stuntdoubles_;
-    int nStuntDoubles_;
+    std::vector<Bond*> bonds_;
+    std::vector<Bend*> bends_;
+    std::vector<Torsion*> torsions_;
+    std::vector<Inversion*> inversions_;
+    std::vector<Molecule*> molecules_;
+    vector<int> nObjects_;
         
   };