Updated file listings. Refs #1881.

Code/Mantid/Framework/Geometry/CMakeLists.txt

-set ( SRC_FILES src/IDetector.cpp src/IInstrument.cpp
-      src/InstrumentRayTracer.cpp src/IObjComponent.cpp src/Quat.cpp
-      src/V3D.cpp 
-      src/Instrument/CompAssembly.cpp
-      src/Instrument/Component.cpp src/Instrument/Detector.cpp
-      src/Instrument/DetectorGroup.cpp src/Instrument/FitParameter.cpp
-      src/Instrument/Instrument.cpp src/Instrument/NearestNeighbours.cpp
-      src/Instrument/ObjCompAssembly.cpp
-      src/Instrument/ObjComponent.cpp src/Instrument/Parameter.cpp
-      src/Instrument/ParameterMap.cpp
-      src/Instrument/ParComponentFactory.cpp
-      src/Instrument/RectangularDetector.cpp
-      src/Instrument/XMLlogfile.cpp 
-      src/Math/Acomp.cpp
-      src/Math/Algebra.cpp src/Math/BnId.cpp src/Math/mathSupport.cpp
-      src/Math/MatrixBase.cpp src/Math/Matrix.cpp
-      src/Math/PolyBase.cpp src/Math/PolyFunction.cpp
-      src/Math/PolyVar.cpp src/Math/PolyVarOne.cpp
-      src/Math/RegexSupport.cpp src/Math/RotCounter.cpp
-      src/Math/SupportGeometry.cpp src/Math/Triple.cpp
-      src/MDGeometry/IMDDimension.cpp src/MDGeometry/MDBasisDimension.cpp
-      src/MDGeometry/MDCell.cpp
-      src/MDGeometry/MDDimension.cpp src/MDGeometry/MDDimensionRes.cpp
-      src/MDGeometry/MDGeometryBasis.cpp src/MDGeometry/MDGeometry.cpp
-      src/MDGeometry/MDGeometryDescription.cpp src/MDGeometry/MDPoint.cpp
-      src/Objects/BoundingBox.cpp src/Objects/Material.cpp
-      src/Objects/Object.cpp src/Objects/RuleItems.cpp
-      src/Objects/Rules.cpp src/Objects/ShapeFactory.cpp
-      src/Objects/Track.cpp 
-      src/Rendering/BitmapGeometryHandler.cpp
-      src/Rendering/CacheGeometryGenerator.cpp
-      src/Rendering/CacheGeometryHandler.cpp
-      src/Rendering/CacheGeometryRenderer.cpp
-      src/Rendering/GeometryHandler.cpp
-      src/Rendering/GluGeometryHandler.cpp
-      src/Rendering/GluGeometryRenderer.cpp
-      src/Rendering/OCGeometryGenerator.cpp
-      src/Rendering/OCGeometryHandler.cpp
-      src/Rendering/OCGeometryRenderer.cpp
-      src/Rendering/vtkGeometryCacheReader.cpp
-      src/Rendering/vtkGeometryCacheWriter.cpp 
-      src/Surfaces/Cone.cpp
-      src/Surfaces/Cylinder.cpp src/Surfaces/General.cpp
-      src/Surfaces/Line.cpp src/Surfaces/LineIntersectVisit.cpp
-      src/Surfaces/Plane.cpp src/Surfaces/Quadratic.cpp
-      src/Surfaces/Sphere.cpp src/Surfaces/Surface.cpp
-      src/Surfaces/SurfaceFactory.cpp src/Surfaces/Torus.cpp )
+set ( SRC_FILES src/IDetector.cpp
+                src/IInstrument.cpp
+		src/InstrumentRayTracer.cpp
+		src/IObjComponent.cpp
+		src/Quat.cpp
+		src/V3D.cpp
+		src/MDGeometry/IMDDimension.cpp
+		src/MDGeometry/MDBasisDimension.cpp
+		src/MDGeometry/MDCell.cpp
+		src/MDGeometry/MDDimension.cpp
+		src/MDGeometry/MDDimensionRes.cpp
+		src/MDGeometry/MDGeometryBasis.cpp
+		src/MDGeometry/MDGeometry.cpp
+		src/MDGeometry/MDGeometryDescription.cpp
+		src/MDGeometry/MDPoint.cpp
+		src/Objects/BoundingBox.cpp
+		src/Objects/Material.cpp
+		src/Objects/Object.cpp
+		src/Objects/RuleItems.cpp
+		src/Objects/Rules.cpp
+		src/Objects/ShapeFactory.cpp
+		src/Objects/Track.cpp
+		src/Instrument/CompAssembly.cpp
+		src/Instrument/Component.cpp
+		src/Instrument/Detector.cpp
+		src/Instrument/DetectorGroup.cpp
+		src/Instrument/FitParameter.cpp
+		src/Instrument/Instrument.cpp
+		src/Instrument/NearestNeighbours.cpp
+		src/Instrument/ObjCompAssembly.cpp
+		src/Instrument/ObjComponent.cpp
+		src/Instrument/Parameter.cpp
+		src/Instrument/ParameterMap.cpp
+		src/Instrument/ParComponentFactory.cpp
+		src/Instrument/RectangularDetector.cpp
+		src/Instrument/XMLlogfile.cpp
+		src/Rendering/BitmapGeometryHandler.cpp
+		src/Rendering/CacheGeometryGenerator.cpp
+		src/Rendering/CacheGeometryHandler.cpp
+		src/Rendering/CacheGeometryRenderer.cpp
+		src/Rendering/GeometryHandler.cpp
+		src/Rendering/GluGeometryHandler.cpp
+		src/Rendering/GluGeometryRenderer.cpp
+		src/Rendering/OCGeometryGenerator.cpp
+		src/Rendering/OCGeometryHandler.cpp
+		src/Rendering/OCGeometryRenderer.cpp
+		src/Rendering/vtkGeometryCacheReader.cpp
+		src/Rendering/vtkGeometryCacheWriter.cpp
+		src/Surfaces/Cone.cpp
+		src/Surfaces/Cylinder.cpp
+		src/Surfaces/General.cpp
+		src/Surfaces/Line.cpp
+		src/Surfaces/LineIntersectVisit.cpp
+		src/Surfaces/Plane.cpp
+		src/Surfaces/Quadratic.cpp
+		src/Surfaces/Sphere.cpp
+		src/Surfaces/Surface.cpp
+		src/Surfaces/SurfaceFactory.cpp
+		src/Surfaces/Torus.cpp )
 
-set ( INC_FILES 
-      inc/MantidGeometry/DllExport.h
-      inc/MantidGeometry/ICompAssembly.h
-      inc/MantidGeometry/IComponent.h inc/MantidGeometry/IDetector.h
-      inc/MantidGeometry/IInstrument.h
-      inc/MantidGeometry/IObjComponent.h
-      inc/MantidGeometry/Quat.h inc/MantidGeometry/Tolerance.h
-      inc/MantidGeometry/V3D.h
-      inc/MantidGeometry/Instrument/CompAssembly.h
-      inc/MantidGeometry/Instrument/Component.h
-      inc/MantidGeometry/Instrument/DetectorGroup.h
-      inc/MantidGeometry/Instrument/Detector.h
-      inc/MantidGeometry/Instrument/FitParameter.h
-      inc/MantidGeometry/Instrument/Instrument.h
-      inc/MantidGeometry/Instrument/NearestNeighbours.h
-      inc/MantidGeometry/Instrument/ObjCompAssembly.h
-      inc/MantidGeometry/Instrument/ObjComponent.h
-      inc/MantidGeometry/Instrument/ParameterFactory.h
-      inc/MantidGeometry/Instrument/Parameter.h
-      inc/MantidGeometry/Instrument/ParameterMap.h
-      inc/MantidGeometry/Instrument/ParComponentFactory.h
-      inc/MantidGeometry/Instrument/RectangularDetector.h
-      inc/MantidGeometry/Instrument/XMLlogfile.h
-      inc/MantidGeometry/Math/Acomp.h
-      inc/MantidGeometry/Math/Algebra.h inc/MantidGeometry/Math/BnId.h
-      inc/MantidGeometry/Math/MapSupport.h
-      inc/MantidGeometry/Math/mathSupport.h
-      inc/MantidGeometry/Math/MatrixBase.h
-      inc/MantidGeometry/Math/Matrix.h
-      inc/MantidGeometry/Math/PolyBase.h
-      inc/MantidGeometry/Math/PolyFunction.h
-      inc/MantidGeometry/Math/PolyVar.h
-      inc/MantidGeometry/Math/RegexSupport.h
-      inc/MantidGeometry/Math/RotCounter.h
-      inc/MantidGeometry/Math/Triple.h
-      inc/MantidGeometry/MDGeometry/IMDDimension.h
-      inc/MantidGeometry/MDGeometry/MDBasisDimension.h
-      inc/MantidGeometry/MDGeometry/MDCell.h
-      inc/MantidGeometry/MDGeometry/MDDimension.h
-      inc/MantidGeometry/MDGeometry/MDDimensionRes.h
-      inc/MantidGeometry/MDGeometry/MDGeometryBasis.h
-      inc/MantidGeometry/MDGeometry/MDGeometryDescription.h
-      inc/MantidGeometry/MDGeometry/MDGeometry.h
-      inc/MantidGeometry/MDGeometry/MDPoint.h
-      inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h
-      inc/MantidGeometry/Objects/BoundingBox.h
-      inc/MantidGeometry/Objects/InstrumentRayTracer.h
-      inc/MantidGeometry/Objects/Material.h
-      inc/MantidGeometry/Objects/Object.h
-      inc/MantidGeometry/Objects/Rules.h
-      inc/MantidGeometry/Objects/ShapeFactory.h
-      inc/MantidGeometry/Objects/Track.h
-      inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
-      inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
-      inc/MantidGeometry/Rendering/CacheGeometryHandler.h
-      inc/MantidGeometry/Rendering/CacheGeometryRenderer.h
-      inc/MantidGeometry/Rendering/GeometryHandler.h
-      inc/MantidGeometry/Rendering/GluGeometryHandler.h
-      inc/MantidGeometry/Rendering/GluGeometryRenderer.h
-      inc/MantidGeometry/Rendering/OCGeometryGenerator.h
-      inc/MantidGeometry/Rendering/OCGeometryHandler.h
-      inc/MantidGeometry/Rendering/OCGeometryRenderer.h
-      inc/MantidGeometry/Rendering/OpenCascadeConfig.h
-      inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
-      inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
-      inc/MantidGeometry/Surfaces/BaseVisit.h
-      inc/MantidGeometry/Surfaces/Cone.h
-      inc/MantidGeometry/Surfaces/Cylinder.h
-      inc/MantidGeometry/Surfaces/General.h
-      inc/MantidGeometry/Surfaces/Line.h
-      inc/MantidGeometry/Surfaces/LineIntersectVisit.h
-      inc/MantidGeometry/Surfaces/Plane.h
-      inc/MantidGeometry/Surfaces/Quadratic.h
-      inc/MantidGeometry/Surfaces/Sphere.h
-      inc/MantidGeometry/Surfaces/SurfaceFactory.h
-      inc/MantidGeometry/Surfaces/Surface.h 
-      inc/MantidGeometry/Surfaces/Torus.h 
-)
+set ( INC_FILES inc/MantidGeometry/DllExport.h
+                inc/MantidGeometry/ICompAssembly.h
+		inc/MantidGeometry/IComponent.h
+		inc/MantidGeometry/IDetector.h
+		inc/MantidGeometry/IInstrument.h
+		inc/MantidGeometry/IObjComponent.h
+		inc/MantidGeometry/Quat.h
+		inc/MantidGeometry/Tolerance.h
+		inc/MantidGeometry/V3D.h
+		inc/MantidGeometry/Instrument/CompAssembly.h
+		inc/MantidGeometry/Instrument/Component.h
+		inc/MantidGeometry/Instrument/DetectorGroup.h
+		inc/MantidGeometry/Instrument/Detector.h
+		inc/MantidGeometry/Instrument/FitParameter.h
+		inc/MantidGeometry/Instrument/Instrument.h
+		inc/MantidGeometry/Instrument/NearestNeighbours.h
+		inc/MantidGeometry/Instrument/ObjCompAssembly.h
+		inc/MantidGeometry/Instrument/ObjComponent.h
+		inc/MantidGeometry/Instrument/ParameterFactory.h
+		inc/MantidGeometry/Instrument/Parameter.h
+		inc/MantidGeometry/Instrument/ParameterMap.h
+		inc/MantidGeometry/Instrument/ParComponentFactory.h
+		inc/MantidGeometry/Instrument/RectangularDetector.h
+		inc/MantidGeometry/Instrument/XMLlogfile.h
+		inc/MantidGeometry/Math/Acomp.h
+		inc/MantidGeometry/Math/Algebra.h
+		inc/MantidGeometry/Math/BnId.h
+		inc/MantidGeometry/Math/MapSupport.h
+		inc/MantidGeometry/Math/mathSupport.h
+		inc/MantidGeometry/Math/MatrixBase.h
+		inc/MantidGeometry/Math/Matrix.h
+		inc/MantidGeometry/Math/PolyBase.h
+		inc/MantidGeometry/Math/PolyFunction.h
+		inc/MantidGeometry/Math/PolyVar.h
+		inc/MantidGeometry/Math/RegexSupport.h
+		inc/MantidGeometry/Math/RotCounter.h
+		inc/MantidGeometry/Math/Triple.h
+		inc/MantidGeometry/MDGeometry/IMDDimension.h
+		inc/MantidGeometry/MDGeometry/MDBasisDimension.h
+		inc/MantidGeometry/MDGeometry/MDCell.h
+		inc/MantidGeometry/MDGeometry/MDDimension.h
+		inc/MantidGeometry/MDGeometry/MDDimensionRes.h
+		inc/MantidGeometry/MDGeometry/MDGeometryBasis.h
+		inc/MantidGeometry/MDGeometry/MDGeometryDescription.h
+		inc/MantidGeometry/MDGeometry/MDGeometry.h
+		inc/MantidGeometry/MDGeometry/MDPoint.h
+		inc/MantidGeometry/MDGeometry/MDWorkspaceConstants.h
+		inc/MantidGeometry/Objects/BoundingBox.h
+		inc/MantidGeometry/Objects/InstrumentRayTracer.h
+		inc/MantidGeometry/Objects/Material.h
+		inc/MantidGeometry/Objects/Object.h
+		inc/MantidGeometry/Objects/Rules.h
+		inc/MantidGeometry/Objects/ShapeFactory.h
+		inc/MantidGeometry/Objects/Track.h
+		inc/MantidGeometry/Rendering/BitmapGeometryHandler.h
+		inc/MantidGeometry/Rendering/CacheGeometryGenerator.h
+		inc/MantidGeometry/Rendering/CacheGeometryHandler.h
+		inc/MantidGeometry/Rendering/CacheGeometryRenderer.h
+		inc/MantidGeometry/Rendering/GeometryHandler.h
+		inc/MantidGeometry/Rendering/GluGeometryHandler.h
+		inc/MantidGeometry/Rendering/GluGeometryRenderer.h
+		inc/MantidGeometry/Rendering/OCGeometryGenerator.h
+		inc/MantidGeometry/Rendering/OCGeometryHandler.h
+		inc/MantidGeometry/Rendering/OCGeometryRenderer.h
+		inc/MantidGeometry/Rendering/OpenCascadeConfig.h
+		inc/MantidGeometry/Rendering/vtkGeometryCacheReader.h
+		inc/MantidGeometry/Rendering/vtkGeometryCacheWriter.h
+		inc/MantidGeometry/Surfaces/BaseVisit.h )
 
 set ( TEST_FILES test/AcompTest.h
       test/AlgebraTest.h 

Code/Mantid/Framework/Kernel/CMakeLists.txt

@@ -44,7 +44,30 @@ set ( SRC_FILES src/ArrayBoundedValidator.cpp
 		src/TimeSplitter.cpp
                 src/Unit.cpp
 		src/UnitFactory.cpp
-		src/VectorHelper.cpp)
+		src/VectorHelper.cpp
+		src/ANN/ANN.cpp
+		src/ANN/bd_fix_rad_search.cpp
+		src/ANN/bd_pr_search.cpp
+		src/ANN/bd_search.cpp
+		src/ANN/bd_tree.cpp
+		src/ANN/bd_tree.h
+		src/ANN/brute.cpp
+		src/ANN/kd_dump.cpp
+		src/ANN/kd_fix_rad_search.cpp
+		src/ANN/kd_fix_rad_search.h
+		src/ANN/kd_pr_search.cpp
+		src/ANN/kd_pr_search.h
+		src/ANN/kd_search.cpp
+		src/ANN/kd_search.h
+		src/ANN/kd_split.cpp
+		src/ANN/kd_split.h
+		src/ANN/kd_tree.cpp
+		src/ANN/kd_tree.h
+		src/ANN/kd_util.cpp
+		src/ANN/kd_util.h
+		src/ANN/perf.cpp
+		src/ANN/pr_queue.h
+		src/ANN/pr_queue_k.h )
 
 set ( INC_FILES inc/MantidKernel/ArrayBoundedValidator.h
                 inc/MantidKernel/ArrayProperty.h
@@ -109,7 +132,10 @@ set ( INC_FILES inc/MantidKernel/ArrayBoundedValidator.h
 		inc/MantidKernel/TimeSplitter.h
 		inc/MantidKernel/UnitFactory.h
 		inc/MantidKernel/Unit.h
-		inc/MantidKernel/VectorHelper.h)
+		inc/MantidKernel/VectorHelper.h
+		inc/MantidKernel/ANN/ANN.h
+		inc/MantidKernel/ANN/ANNperf.h
+		inc/MantidKernel/ANN/ANNx.h )
 
 set ( TEST_FILES test/ArrayPropertyTest.h 
                  #test/BinaryFileTest.h